From 314cc5c2f5eb2f7a3b289f6f7fbe877d87f4c2ec Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 2 Jul 2018 18:07:47 +0300
Subject: [PATCH] Add support for Android Studio 3.3 Canary 1

---
 .../kotlin-script-util/build.gradle.kts.as32  |   2 +-
 versions.gradle.kts                           |  16 ++
 versions.gradle.kts.172                       |  16 ++
 versions.gradle.kts.173                       |  16 ++
 versions.gradle.kts.182                       |  16 ++
 versions.gradle.kts.as31                      |  16 ++
 versions.gradle.kts.as32                      |  16 ++
 versions.gradle.kts.as33                      | 140 ++++++++++++++++++
 8 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 versions.gradle.kts.as33

diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 b/libraries/tools/kotlin-script-util/build.gradle.kts.as32
index 664346a6efe..33a291766ca 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts.as32
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts.as32
@@ -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 {
diff --git a/versions.gradle.kts b/versions.gradle.kts
index ceb9352f2c0..b8fe03fdc95 100644
--- a/versions.gradle.kts
+++ b/versions.gradle.kts
@@ -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
     }
diff --git a/versions.gradle.kts.172 b/versions.gradle.kts.172
index ad3fcea0193..0d7ae442a94 100644
--- a/versions.gradle.kts.172
+++ b/versions.gradle.kts.172
@@ -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
     }
diff --git a/versions.gradle.kts.173 b/versions.gradle.kts.173
index bf250c84de4..7d766219d07 100644
--- a/versions.gradle.kts.173
+++ b/versions.gradle.kts.173
@@ -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
     }
diff --git a/versions.gradle.kts.182 b/versions.gradle.kts.182
index fdda8cdc0e8..a180dc8d3bf 100644
--- a/versions.gradle.kts.182
+++ b/versions.gradle.kts.182
@@ -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
     }
diff --git a/versions.gradle.kts.as31 b/versions.gradle.kts.as31
index 1eb59d7c479..6aca6ba4c61 100644
--- a/versions.gradle.kts.as31
+++ b/versions.gradle.kts.as31
@@ -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
     }
diff --git a/versions.gradle.kts.as32 b/versions.gradle.kts.as32
index 42b5d20a013..4756700cfc5 100644
--- a/versions.gradle.kts.as32
+++ b/versions.gradle.kts.as32
@@ -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
     }
diff --git a/versions.gradle.kts.as33 b/versions.gradle.kts.as33
new file mode 100644
index 00000000000..59fc1375fa1
--- /dev/null
+++ b/versions.gradle.kts.as33
@@ -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
+}