diff --git a/.bunch b/.bunch index f7b34b78068..de35f65eaed 100644 --- a/.bunch +++ b/.bunch @@ -4,5 +4,6 @@ as31_173_181 as32_181 as33 +as34_as33 183 191_183 diff --git a/buildSrc/gradle.properties.as34 b/buildSrc/gradle.properties.as34 new file mode 100644 index 00000000000..7f980c78d78 --- /dev/null +++ b/buildSrc/gradle.properties.as34 @@ -0,0 +1,11 @@ +org.gradle.daemon=true +org.gradle.parallel=false +org.gradle.configureondemand=false +org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m + +cacheRedirectorEnabled=true + +#buildSrc.kotlin.repo=https://jcenter.bintray.com +#buildSrc.kotlin.version=1.1.50 + +intellijUltimateEnabled=false diff --git a/idea/src/META-INF/plugin.xml.as34 b/idea/src/META-INF/plugin.xml.as34 new file mode 100644 index 00000000000..8dae5016de1 --- /dev/null +++ b/idea/src/META-INF/plugin.xml.as34 @@ -0,0 +1,73 @@ + + org.jetbrains.kotlin + + Kotlin + +Getting Started in IntelliJ IDEA
+Getting Started in Android Studio
+Public Slack
+Issue tracker
+]]>
+ @snapshot@ + JetBrains + + + + com.intellij.modules.platform + com.intellij.modules.androidstudio + + + org.jetbrains.kotlin.native.platform.deps + + JUnit + org.jetbrains.plugins.gradle + org.jetbrains.plugins.gradle.java + org.jetbrains.idea.maven + TestNG-J + com.intellij.copyright + Coverage + com.intellij.java-i18n + org.jetbrains.java.decompiler + Git4Idea + + + + + com.intellij.modules.java + JavaScriptDebugger + com.intellij.copyright + org.intellij.intelliLang + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/versions.gradle.kts.as34 b/versions.gradle.kts.as34 new file mode 100644 index 00000000000..35d676c04bd --- /dev/null +++ b/versions.gradle.kts.as34 @@ -0,0 +1,175 @@ +extra["versions.intellijSdk"] = "182.4505.22" +extra["versions.androidBuildTools"] = "r23.0.1" +extra["versions.idea.NodeJS"] = "181.3494.12" +extra["versions.androidStudioRelease"] = "3.4.0.0" +extra["versions.androidStudioBuild"] = "182.5070326" + +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) { + "183" -> { + extra["versions.jar.guava"] = "25.1-jre" + extra["versions.jar.groovy-all"] = "2.4.15" + 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.7" + 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 + } + "182" -> { + extra["versions.jar.guava"] = "23.6-jre" + extra["versions.jar.groovy-all"] = "2.4.15" + 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"] = "23.6-jre" + extra["versions.jar.groovy-all"] = "2.4.15" + 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.4" + } + + extra["ignore.jar.snappy-in-java"] = true + extra["ignore.jar.common"] = true + extra["ignore.jar.lombok-ast"] = true + } + "AS34" -> { + extra["versions.jar.guava"] = "23.6-jre" + extra["versions.jar.groovy-all"] = "2.4.15" + 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.4" + } + + extra["ignore.jar.snappy-in-java"] = true + extra["ignore.jar.common"] = true + extra["ignore.jar.lombok-ast"] = true + } +} + +if (!extra.has("versions.androidStudioRelease")) { + extra["ignore.jar.android-base-common"] = true +}