Minor. Remove useless code related to IJ 173 and AS 3.1 in build scripts
This commit is contained in:
@@ -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),
|
||||
|
||||
@@ -55,7 +55,7 @@ dependencies {
|
||||
|
||||
testRuntime(intellijPluginDep("android"))
|
||||
|
||||
(Platform[181].orHigher.or(Ide.AS31)) {
|
||||
if (Platform[181].orHigher()) {
|
||||
testRuntime(intellijPluginDep("smali"))
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -57,7 +57,7 @@ dependencies {
|
||||
testRuntime(intellijPluginDep("maven"))
|
||||
}
|
||||
testRuntime(intellijPluginDep("android"))
|
||||
(Platform[181].orHigher.or(Ide.AS31)) {
|
||||
if (Platform[181].orHigher()) {
|
||||
testRuntime(intellijPluginDep("smali"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user