Remove 182 and AS33 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, P182, P183, P191, P192;
|
P181, P183, P191, P192;
|
||||||
|
|
||||||
val version: Int = name.drop(1).toInt()
|
val version: Int = name.drop(1).toInt()
|
||||||
|
|
||||||
@@ -42,13 +42,11 @@ enum class Platform : CompatibilityPredicate {
|
|||||||
|
|
||||||
enum class Ide(val platform: Platform) : CompatibilityPredicate {
|
enum class Ide(val platform: Platform) : CompatibilityPredicate {
|
||||||
IJ181(Platform.P181),
|
IJ181(Platform.P181),
|
||||||
IJ182(Platform.P182),
|
|
||||||
IJ183(Platform.P183),
|
IJ183(Platform.P183),
|
||||||
IJ191(Platform.P191),
|
IJ191(Platform.P191),
|
||||||
IJ192(Platform.P192),
|
IJ192(Platform.P192),
|
||||||
|
|
||||||
AS32(Platform.P181),
|
AS32(Platform.P181),
|
||||||
AS33(Platform.P182),
|
|
||||||
AS34(Platform.P183),
|
AS34(Platform.P183),
|
||||||
AS35(Platform.P183),
|
AS35(Platform.P183),
|
||||||
AS36(Platform.P192);
|
AS36(Platform.P192);
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ dependencies {
|
|||||||
compile(project(":core:descriptors"))
|
compile(project(":core:descriptors"))
|
||||||
compile(project(":core:descriptors.jvm"))
|
compile(project(":core:descriptors.jvm"))
|
||||||
compile(project(":compiler:util"))
|
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"))
|
compile(project(":compiler:frontend"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -76,12 +76,12 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
if (Ide.AS33.orHigher() || Ide.IJ191.orHigher()) {
|
if (Ide.IJ183()) {
|
||||||
"main" { }
|
|
||||||
"test" { }
|
|
||||||
} else {
|
|
||||||
"main" { projectDefault() }
|
"main" { projectDefault() }
|
||||||
"test" { projectDefault() }
|
"test" { projectDefault() }
|
||||||
|
} else {
|
||||||
|
"main" { }
|
||||||
|
"test" { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -63,12 +63,12 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
if (Ide.AS33.orHigher() || Ide.IJ191.orHigher()) {
|
if (Ide.IJ183()) {
|
||||||
"main" { }
|
|
||||||
"test" { }
|
|
||||||
} else {
|
|
||||||
"main" { projectDefault() }
|
"main" { projectDefault() }
|
||||||
"test" { projectDefault() }
|
"test" { projectDefault() }
|
||||||
|
} else {
|
||||||
|
"main" { }
|
||||||
|
"test" { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ dependencies {
|
|||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
compile(project(":idea:idea-core"))
|
compile(project(":idea:idea-core"))
|
||||||
|
|
||||||
Ide.AS33.orHigher.not {
|
Ide.IJ183 {
|
||||||
compile(project(":idea:idea-android"))
|
compile(project(":idea:idea-android"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user