From 07b0eeccc45ad94e9e0bcb7edd8e94fb65df6b60 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Thu, 14 Jun 2018 17:34:42 +0300
Subject: [PATCH] Build: Reduce differences in versions scripts

---
 build.gradle.kts         |  4 +--
 versions.gradle.kts      | 72 ++++++++++++++++++++++++---------------
 versions.gradle.kts.172  | 73 +++++++++++++++++++++++++---------------
 versions.gradle.kts.173  | 73 +++++++++++++++++++++++++---------------
 versions.gradle.kts.182  | 49 +++++++++++++--------------
 versions.gradle.kts.as31 | 73 +++++++++++++++++++++++++---------------
 versions.gradle.kts.as32 | 57 ++++++++++++++++---------------
 7 files changed, 233 insertions(+), 168 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 97c74b48b45..6aa5fa022ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -170,12 +170,12 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks
 extra["IntellijCoreDependencies"] =
         listOf("annotations",
                "asm-all",
-               "guava-21.0",
+               "guava",
                "jdom",
                "jna",
                "log4j",
                "picocontainer",
-               "snappy-in-java-0.5.1",
+               "snappy-in-java",
                "streamex",
                "trove4j")
 
diff --git a/versions.gradle.kts b/versions.gradle.kts
index 3c698b2a791..ceb9352f2c0 100644
--- a/versions.gradle.kts
+++ b/versions.gradle.kts
@@ -19,10 +19,32 @@ val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
 else
     null
 
-val platform = androidStudioVersion?.let { "AS" + it }
-        ?: extra["versions.intellijSdk"].toString().substringBefore('.')
+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"
@@ -32,6 +54,7 @@ when (platform) {
         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"
         }
@@ -44,6 +67,7 @@ when (platform) {
         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"
         }
@@ -57,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -94,10 +93,27 @@ when (platform) {
         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
     }
diff --git a/versions.gradle.kts.172 b/versions.gradle.kts.172
index 1fafcc3346c..ad3fcea0193 100644
--- a/versions.gradle.kts.172
+++ b/versions.gradle.kts.172
@@ -19,10 +19,32 @@ val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
 else
     null
 
-val platform = androidStudioVersion?.let { "AS" + it }
-        ?: extra["versions.intellijSdk"].toString().substringBefore('.')
+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"
@@ -31,6 +53,8 @@ when (platform) {
         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"
         }
@@ -43,6 +67,7 @@ when (platform) {
         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"
         }
@@ -56,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -93,10 +93,27 @@ when (platform) {
         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
     }
diff --git a/versions.gradle.kts.173 b/versions.gradle.kts.173
index 8833322f05b..bf250c84de4 100644
--- a/versions.gradle.kts.173
+++ b/versions.gradle.kts.173
@@ -19,10 +19,32 @@ val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
 else
     null
 
-val platform = androidStudioVersion?.let { "AS" + it }
-        ?: extra["versions.intellijSdk"].toString().substringBefore('.')
+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"
@@ -31,6 +53,8 @@ when (platform) {
         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"
         }
@@ -43,6 +67,7 @@ when (platform) {
         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"
         }
@@ -56,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -93,10 +93,27 @@ when (platform) {
         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
     }
diff --git a/versions.gradle.kts.182 b/versions.gradle.kts.182
index e2d51946de3..5ba0c459f07 100644
--- a/versions.gradle.kts.182
+++ b/versions.gradle.kts.182
@@ -38,9 +38,12 @@ when (platform) {
         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"
@@ -51,6 +54,7 @@ when (platform) {
         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"
         }
@@ -63,6 +67,7 @@ when (platform) {
         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"
         }
@@ -76,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -113,10 +93,27 @@ when (platform) {
         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
     }
diff --git a/versions.gradle.kts.as31 b/versions.gradle.kts.as31
index dfb59e74fa6..1eb59d7c479 100644
--- a/versions.gradle.kts.as31
+++ b/versions.gradle.kts.as31
@@ -19,10 +19,32 @@ val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
 else
     null
 
-val platform = androidStudioVersion?.let { "AS" + it }
-        ?: extra["versions.intellijSdk"].toString().substringBefore('.')
+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"
@@ -31,6 +53,8 @@ when (platform) {
         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"
         }
@@ -43,6 +67,7 @@ when (platform) {
         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"
         }
@@ -56,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -93,10 +93,27 @@ when (platform) {
         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
     }
diff --git a/versions.gradle.kts.as32 b/versions.gradle.kts.as32
index 6ab801b4001..42b5d20a013 100644
--- a/versions.gradle.kts.as32
+++ b/versions.gradle.kts.as32
@@ -19,10 +19,32 @@ val androidStudioVersion = if (extra.has("versions.androidStudioRelease"))
 else
     null
 
-val platform = androidStudioVersion?.let { "AS" + it }
-        ?: extra["versions.intellijSdk"].toString().substringBefore('.')
+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"
@@ -32,6 +54,7 @@ when (platform) {
         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"
         }
@@ -44,6 +67,7 @@ when (platform) {
         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"
         }
@@ -57,36 +81,11 @@ when (platform) {
         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"
         }
     }
-    "171" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.3"
-        }
-    }
-    "AS30" -> {
-        extra["versions.jar.guava"] = "19.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"
-        for (jar in gradleJars) {
-            extra["versions.jar.$jar"] = "3.5"
-        }
-
-        extra["ignore.jar.common"] = true
-    }
     "AS31" -> {
         extra["versions.jar.guava"] = "21.0"
         extra["versions.jar.groovy-all"] = "2.4.12"
@@ -94,6 +93,7 @@ when (platform) {
         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"
         }
@@ -109,6 +109,7 @@ when (platform) {
         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"
         }