From 8ae4293a0f46312b3f9425e30c1c3a5662e5f267 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 28 Aug 2019 14:12:11 +0300 Subject: [PATCH] Remove 181 branch from build scripts #KT-33536 Fixed --- buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt | 4 +--- idea/idea-android/build.gradle.kts | 7 +------ jps-plugin/build.gradle.kts | 6 +----- .../android-extensions-idea/build.gradle.kts | 4 +--- plugins/kapt3/kapt3-compiler/build.gradle.kts | 4 +--- .../sam-with-receiver-ide/build.gradle.kts | 4 +--- 6 files changed, 6 insertions(+), 23 deletions(-) diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index 0742602c78e..d8b3ba4ef0b 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 { - P181, P183, P191, P192; + P183, P191, P192; val version: Int = name.drop(1).toInt() @@ -41,12 +41,10 @@ enum class Platform : CompatibilityPredicate { } enum class Ide(val platform: Platform) : CompatibilityPredicate { - IJ181(Platform.P181), IJ183(Platform.P183), IJ191(Platform.P191), IJ192(Platform.P192), - AS32(Platform.P181), AS34(Platform.P183), AS35(Platform.P183), AS36(Platform.P192); diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index af6d57ca3fe..00e07687057 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -1,6 +1,3 @@ - -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { kotlin("jvm") id("jps-compatible") @@ -55,9 +52,7 @@ dependencies { testRuntime(intellijPluginDep("android")) - if (Platform[181].orHigher()) { - testRuntime(intellijPluginDep("smali")) - } + testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("copyright")) testRuntime(intellijPluginDep("coverage")) diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index b1265cd780b..b3761e13a91 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -19,11 +19,7 @@ dependencies { compile(projectRuntimeJar(":kotlin-preloader")) compile(project(":idea:idea-jps-common")) compileOnly(intellijDep()) { - if (Platform[181].orHigher()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) - } else { - includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) - } + includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) } compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index a63dff0c64b..ff8e8a2708f 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -57,9 +57,7 @@ dependencies { testRuntime(intellijPluginDep("maven")) } testRuntime(intellijPluginDep("android")) - if (Platform[181].orHigher()) { - testRuntime(intellijPluginDep("smali")) - } + testRuntime(intellijPluginDep("smali")) } sourceSets { diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 924288de85d..cb13628971e 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -11,9 +11,7 @@ dependencies { testRuntime(intellijDep()) testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") } - Platform[181].orHigher { - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } - } + testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } Platform[192].orHigher { testRuntime(intellijPluginDep("java")) diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts index c5430c11442..5dcdc7bff2a 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts @@ -22,9 +22,7 @@ dependencies { compile(project(":idea:idea-jvm")) compileOnly(intellijDep()) { includeJars("openapi", "extensions", "util") } - Platform[181].orHigher { - compileOnly(intellijDep()) { includeJars("platform-api") } - } + compileOnly(intellijDep()) { includeJars("platform-api") } } sourceSets {