azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for Android Studio 3.3 Canary 1

Browse Source
This commit is contained in:
Yan Zhulanow
2018-07-02 18:07:47 +03:00
parent 315de660ca
commit 314cc5c2f5
8 changed files with 237 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/build.gradle.kts.as32
+1 -1
View File
@@ -24,7 +24,7 @@ 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", "util") }
testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") }
}
projectTest {
versions.gradle.kts
+16
View File
@@ -114,6 +114,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.172
+16
View File
@@ -114,6 +114,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.173
+16
View File
@@ -114,6 +114,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.182
+16
View File
@@ -113,6 +113,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.as31
+16
View File
@@ -114,6 +114,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.as32
+16
View File
@@ -114,6 +114,22 @@ when (platform) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
versions.gradle.kts.as33
+140
View File
@@ -0,0 +1,140 @@
extra["versions.intellijSdk"] = "181.4892.42"
extra["versions.androidBuildTools"] = "r23.0.1"
extra["versions.idea.NodeJS"] = "181.2784.17"
extra["versions.androidStudioRelease"] = "3.3.0.0"
extra["versions.androidStudioBuild"] = "181.4861037"
val gradleJars = listOf(
"gradle-api",
"gradle-tooling-api",
"gradle-base-services",
"gradle-wrapper",
"gradle-core",
"gradle-base-services-groovy"
)
val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
extra["versions.androidStudioRelease"]?.toString()?.replace(".", "")?.substring(0, 2)
else
null
val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-'))
if (intellijVersionDelimiterIndex == -1) {
error("Invalid IDEA version $intellijVersion")
}
val platformBaseVersion = intellijVersion.substring(0, intellijVersionDelimiterIndex)
val platform = androidStudioVersion?.let { "AS$it" } ?: platformBaseVersion
when (platform) {
"182" -> {
extra["versions.jar.guava"] = "23.6-jre"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2-2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.4"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.picocontainer"] = "1.2"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.5.1"
}
extra["ignore.jar.snappy-in-java"] = true
}
"181" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2-2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
}
"173" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.0"
}
extra["ignore.jar.lombok-ast-0.2.3"] = true
}
"172" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.6"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.2"
extra["versions.jar.gson"] = "2.5"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "3.5"
}
}
"AS31" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.0"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS32" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
"AS33" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
extra["versions.jar.oro"] = "2.0.8"
extra["versions.jar.snappy-in-java"] = "0.5.1"
for (jar in gradleJars) {
extra["versions.jar.$jar"] = "4.4"
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
}
if (!extra.has("versions.androidStudioRelease")) {
extra["ignore.jar.android-base-common"] = true
}