diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index aa84f7539b4..579e6522976 100644 --- a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt +++ b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt @@ -26,7 +26,7 @@ fun CompatibilityPredicate.or(other: CompatibilityPredicate): CompatibilityPredi } enum class Platform : CompatibilityPredicate { - P173, P181, P182, P183, P191; + P181, P182, P183, P191; val version: Int = name.drop(1).toInt() @@ -41,13 +41,11 @@ enum class Platform : CompatibilityPredicate { } enum class Ide(val platform: Platform) : CompatibilityPredicate { - IJ173(Platform.P173), IJ181(Platform.P181), IJ182(Platform.P182), IJ183(Platform.P183), IJ191(Platform.P191), - AS31(Platform.P173), AS32(Platform.P181), AS33(Platform.P182), AS34(Platform.P183), diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index d94f64a57d7..6d52c792155 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntime(intellijPluginDep("android")) - (Platform[181].orHigher.or(Ide.AS31)) { + if (Platform[181].orHigher()) { testRuntime(intellijPluginDep("smali")) } diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index b8be6c56e9b..4b8b119f1e2 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -32,12 +32,8 @@ dependencies { testRuntime("org.sonatype.aether:aether-api:1.13.1") testRuntime("org.apache.maven:maven-core:3.0.3") compileOnly(intellijDep()) { includeJars("openapi", "util") } + testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } - if (Platform[173].orLower()) { - testCompile(intellijDep()) { includeJars("openapi", "util") } - } else { - testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } - } } projectTest { diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index c6d27057ea6..392d8faa353 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { testRuntime(intellijPluginDep("maven")) } testRuntime(intellijPluginDep("android")) - (Platform[181].orHigher.or(Ide.AS31)) { + if (Platform[181].orHigher()) { testRuntime(intellijPluginDep("smali")) } } diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 1188d156070..b46311c851a 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -18,11 +18,6 @@ dependencies { compileOnly(intellijDep()) { includeJars("java-api", "java-impl", "asm-all", rootProject = rootProject) } } - Platform[173].orLower { - compile(project(":idea:idea-core")) - compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions", "asm-all", rootProject = rootProject) } - } - testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) @@ -34,10 +29,6 @@ dependencies { testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") } } - Platform[173].orLower { - testCompileOnly(intellijDep()) { includeJars("idea_rt") } - } - testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }