Remove 181 branch from build scripts
#KT-33536 Fixed
This commit is contained in:
@@ -26,7 +26,7 @@ fun CompatibilityPredicate.or(other: CompatibilityPredicate): CompatibilityPredi
|
|||||||
}
|
}
|
||||||
|
|
||||||
enum class Platform : CompatibilityPredicate {
|
enum class Platform : CompatibilityPredicate {
|
||||||
P181, P183, P191, P192;
|
P183, P191, P192;
|
||||||
|
|
||||||
val version: Int = name.drop(1).toInt()
|
val version: Int = name.drop(1).toInt()
|
||||||
|
|
||||||
@@ -41,12 +41,10 @@ enum class Platform : CompatibilityPredicate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
enum class Ide(val platform: Platform) : CompatibilityPredicate {
|
enum class Ide(val platform: Platform) : CompatibilityPredicate {
|
||||||
IJ181(Platform.P181),
|
|
||||||
IJ183(Platform.P183),
|
IJ183(Platform.P183),
|
||||||
IJ191(Platform.P191),
|
IJ191(Platform.P191),
|
||||||
IJ192(Platform.P192),
|
IJ192(Platform.P192),
|
||||||
|
|
||||||
AS32(Platform.P181),
|
|
||||||
AS34(Platform.P183),
|
AS34(Platform.P183),
|
||||||
AS35(Platform.P183),
|
AS35(Platform.P183),
|
||||||
AS36(Platform.P192);
|
AS36(Platform.P192);
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
@@ -55,9 +52,7 @@ dependencies {
|
|||||||
|
|
||||||
testRuntime(intellijPluginDep("android"))
|
testRuntime(intellijPluginDep("android"))
|
||||||
|
|
||||||
if (Platform[181].orHigher()) {
|
testRuntime(intellijPluginDep("smali"))
|
||||||
testRuntime(intellijPluginDep("smali"))
|
|
||||||
}
|
|
||||||
|
|
||||||
testRuntime(intellijPluginDep("copyright"))
|
testRuntime(intellijPluginDep("copyright"))
|
||||||
testRuntime(intellijPluginDep("coverage"))
|
testRuntime(intellijPluginDep("coverage"))
|
||||||
|
|||||||
@@ -19,11 +19,7 @@ dependencies {
|
|||||||
compile(projectRuntimeJar(":kotlin-preloader"))
|
compile(projectRuntimeJar(":kotlin-preloader"))
|
||||||
compile(project(":idea:idea-jps-common"))
|
compile(project(":idea:idea-jps-common"))
|
||||||
compileOnly(intellijDep()) {
|
compileOnly(intellijDep()) {
|
||||||
if (Platform[181].orHigher()) {
|
includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
|
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
|
||||||
testCompileOnly(project(":kotlin-reflect-api"))
|
testCompileOnly(project(":kotlin-reflect-api"))
|
||||||
|
|||||||
@@ -57,9 +57,7 @@ dependencies {
|
|||||||
testRuntime(intellijPluginDep("maven"))
|
testRuntime(intellijPluginDep("maven"))
|
||||||
}
|
}
|
||||||
testRuntime(intellijPluginDep("android"))
|
testRuntime(intellijPluginDep("android"))
|
||||||
if (Platform[181].orHigher()) {
|
testRuntime(intellijPluginDep("smali"))
|
||||||
testRuntime(intellijPluginDep("smali"))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ dependencies {
|
|||||||
testRuntime(intellijDep())
|
testRuntime(intellijDep())
|
||||||
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
|
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 {
|
Platform[192].orHigher {
|
||||||
testRuntime(intellijPluginDep("java"))
|
testRuntime(intellijPluginDep("java"))
|
||||||
|
|||||||
@@ -22,9 +22,7 @@ dependencies {
|
|||||||
compile(project(":idea:idea-jvm"))
|
compile(project(":idea:idea-jvm"))
|
||||||
|
|
||||||
compileOnly(intellijDep()) { includeJars("openapi", "extensions", "util") }
|
compileOnly(intellijDep()) { includeJars("openapi", "extensions", "util") }
|
||||||
Platform[181].orHigher {
|
compileOnly(intellijDep()) { includeJars("platform-api") }
|
||||||
compileOnly(intellijDep()) { includeJars("platform-api") }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
Reference in New Issue
Block a user