diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt index 0573d8e9b49..0742602c78e 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, P182, P183, P191, P192; + P181, P183, P191, P192; val version: Int = name.drop(1).toInt() @@ -42,13 +42,11 @@ enum class Platform : CompatibilityPredicate { enum class Ide(val platform: Platform) : CompatibilityPredicate { IJ181(Platform.P181), - IJ182(Platform.P182), IJ183(Platform.P183), IJ191(Platform.P191), IJ192(Platform.P192), AS32(Platform.P181), - AS33(Platform.P182), AS34(Platform.P183), AS35(Platform.P183), AS36(Platform.P192); diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index 16499950da8..2f69c936ef7 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -7,9 +7,7 @@ dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) compile(project(":compiler:util")) - if (Platform[182].orHigher()) { - compile("javax.annotation:jsr250-api:1.0") - } + compile("javax.annotation:jsr250-api:1.0") compile(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 8f5246dab69..af6d57ca3fe 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -76,12 +76,12 @@ dependencies { } sourceSets { - if (Ide.AS33.orHigher() || Ide.IJ191.orHigher()) { - "main" { } - "test" { } - } else { + if (Ide.IJ183()) { "main" { projectDefault() } "test" { projectDefault() } + } else { + "main" { } + "test" { } } } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index d3de58e0ac6..a63dff0c64b 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -63,12 +63,12 @@ dependencies { } sourceSets { - if (Ide.AS33.orHigher() || Ide.IJ191.orHigher()) { - "main" { } - "test" { } - } else { + if (Ide.IJ183()) { "main" { projectDefault() } "test" { projectDefault() } + } else { + "main" { } + "test" { } } } 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 27ab3b54c33..c5430c11442 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 @@ -14,7 +14,7 @@ dependencies { compile(project(":compiler:frontend.java")) compile(project(":idea:idea-core")) - Ide.AS33.orHigher.not { + Ide.IJ183 { compile(project(":idea:idea-android")) }