Upgrade embedded Kotlin version to 1.5.31

gradle · Sep 21, 2021 · 15e7bfa · 15e7bfa
1 parent 8edc491
commit 15e7bfa
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/...endency-modules/src/main/kotlin/gradlebuild/modules/extension/ExternalModulesExtension.kt b/...endency-modules/src/main/kotlin/gradlebuild/modules/extension/ExternalModulesExtension.kt
@@ -21,7 +21,7 @@ import gradlebuild.modules.model.License
 abstract class ExternalModulesExtension {
 
     val groovyVersion = "3.0.8"
-    val kotlinVersion = "1.5.30"
+    val kotlinVersion = "1.5.31"
 
     fun futureKotlin(module: String) = "org.jetbrains.kotlin:kotlin-$module:$kotlinVersion"
 

diff --git a/...-init/src/main/resources/org/gradle/buildinit/tasks/templates/library-versions.properties b/...-init/src/main/resources/org/gradle/buildinit/tasks/templates/library-versions.properties
@@ -5,7 +5,7 @@ groovy=3.0.8
 guava=30.1.1-jre
 junit-jupiter=5.7.2
 junit=4.13.2
-kotlin=1.5.30
+kotlin=1.5.31
 scala-library=2.13.6
 scala-xml=1.2.0
 scala=2.13

diff --git a/subprojects/docs/src/docs/userguide/compatibility.adoc b/subprojects/docs/src/docs/userguide/compatibility.adoc
@@ -41,7 +41,7 @@ For older Gradle versions, please see the table below which Java version is supp
 |===
 
 == Kotlin
-Gradle is tested with Kotlin 1.3.72 through 1.5.30.
+Gradle is tested with Kotlin 1.3.72 through 1.5.31.
 
 == Groovy
 Gradle is tested with Groovy 1.5.8 through 3.0.8.

diff --git a/...organization/structuring-software-projects/groovy/platforms/plugins-platform/build.gradle b/...organization/structuring-software-projects/groovy/platforms/plugins-platform/build.gradle
@@ -7,8 +7,8 @@ group = 'com.example.platform'
 dependencies {
     constraints {
         api('com.android.tools.build:gradle:4.1.1')
-        api('org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.5.30')
-        api('org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.30')
+        api('org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.5.31')
+        api('org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.31')
         api('org.springframework.boot:org.springframework.boot.gradle.plugin:2.4.0')
     }
 }
diff --git a/...nization/structuring-software-projects/kotlin/platforms/plugins-platform/build.gradle.kts b/...nization/structuring-software-projects/kotlin/platforms/plugins-platform/build.gradle.kts
@@ -7,8 +7,8 @@ group = "com.example.platform"
 dependencies {
     constraints {
         api("com.android.tools.build:gradle:4.1.1")
-        api("org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.5.30")
-        api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.30")
+        api("org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.5.31")
+        api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.31")
         api("org.springframework.boot:org.springframework.boot.gradle.plugin:2.4.0")
     }
 }
diff --git a/subprojects/docs/src/snippets/java/toolchain-kotlin/groovy/build.gradle b/subprojects/docs/src/snippets/java/toolchain-kotlin/groovy/build.gradle
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.5.30"
+    id "org.jetbrains.kotlin.jvm" version "1.5.31"
 }
 
 repositories {

diff --git a/subprojects/docs/src/snippets/java/toolchain-kotlin/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/java/toolchain-kotlin/kotlin/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 plugins {
-    kotlin("jvm") version "1.5.30"
+    kotlin("jvm") version "1.5.31"
 }
 
 repositories {

diff --git a/subprojects/docs/src/snippets/kotlinDsl/androidBuild/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/kotlinDsl/androidBuild/kotlin/build.gradle.kts
@@ -2,8 +2,8 @@
 plugins {
     id("com.android.application") version "4.1.2" apply false
 // end::android[]
-    kotlin("android") version "1.5.30" apply false
-    kotlin("android.extensions") version "1.5.30" apply false
+    kotlin("android") version "1.5.31" apply false
+    kotlin("android.extensions") version "1.5.31" apply false
 // tag::android[]
 }
 // end::android[]

diff --git a/subprojects/docs/src/snippets/kotlinDsl/androidSingleBuild/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/kotlinDsl/androidSingleBuild/kotlin/build.gradle.kts
@@ -2,8 +2,8 @@
 plugins {
     id("com.android.application") version "4.1.2"
 // end::android[]
-    kotlin("android") version "1.5.30"
-    kotlin("android.extensions") version "1.5.30"
+    kotlin("android") version "1.5.31"
+    kotlin("android.extensions") version "1.5.31"
 // tag::android[]
 }
 

diff --git a/...roovy/org/gradle/integtests/NestedInputKotlinImplementationTrackingIntegrationTest.groovy b/...roovy/org/gradle/integtests/NestedInputKotlinImplementationTrackingIntegrationTest.groovy
@@ -136,7 +136,7 @@ class NestedInputKotlinImplementationTrackingIntegrationTest extends AbstractPlu
     def "task action defined in Kotlin 1.5 can be tracked when using language version 1.4"() {
         file("buildSrc/build.gradle.kts") << """
             plugins {
-                kotlin("jvm") version("1.5.30")
+                kotlin("jvm") version("1.5.31")
                 `java-gradle-plugin`
             }
 

diff --git a/...src/main/groovy/org/gradle/integtests/fixtures/versions/KotlinGradlePluginVersions.groovy b/...src/main/groovy/org/gradle/integtests/fixtures/versions/KotlinGradlePluginVersions.groovy
@@ -25,7 +25,7 @@ class KotlinGradlePluginVersions {
     private static final List<String> LATEST_VERSIONS = [
         '1.3.72',
         '1.4.0', '1.4.10', '1.4.21', '1.4.31',
-        '1.5.0', '1.5.30'
+        '1.5.0', '1.5.31'
     ]
 
     List<String> getLatests() {

diff --git a/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy b/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy
@@ -167,7 +167,7 @@ abstract class AbstractSmokeTest extends Specification {
 
         // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.allopen
         // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.spring
-        static kotlinPlugins = Versions.of("1.4.21-2", "1.4.31", "1.5.30")
+        static kotlinPlugins = Versions.of("1.4.21-2", "1.4.31", "1.5.31")
 
         // https://plugins.gradle.org/plugin/com.moowork.grunt
         // https://plugins.gradle.org/plugin/com.moowork.gulp