update Kotlin to 1.9.24 and API version to 1.8

alexanderpann · alexanderpann · commit aaa98070f03c · 2024-09-27T14:40:27.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,16 +11,15 @@ buildscript {
     }
 }
 
-val kotlinApiVersion by extra { "1.7" }
-val kotlinVersion by extra { "$kotlinApiVersion.10" }
-
+val kotlinApiVersion: String by project
+val kotlinVersion: String by project
 
 plugins {
     groovy
     `java-gradle-plugin`
     `kotlin-dsl`
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm")
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
 }
 
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
@@ -2,36 +2,36 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.googlecode.java-diff-utils:diffutils:1.3.0=classpath
-org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.3.1=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.3.1=classpath
+org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.5.0=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.5.0=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.10=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-assignment:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.9.22=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.9.22=classpath
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.9.24=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.24=classpath
 org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.13.2=classpath
 org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -6,26 +6,24 @@ junit:junit:4.13.2=testCompileClasspath,testImplementationDependenciesMetadata,t
 net.swiftzer.semver:semver:1.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-build-common:1.9.22=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.22=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.22=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-build-common:1.9.24=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.24=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.24=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.24=kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=implementationDependenciesMetadata,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=implementationDependenciesMetadata,runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.9.24=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.24=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath
-org.jetbrains:annotations:13.0=compileClasspath,embeddedKotlin,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,mps,runtimeOnlyDependenciesMetadata,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntimeOnlyDependenciesMetadata
+org.jetbrains:annotations:13.0=compileClasspath,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+empty=annotationProcessor,apiDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,mps,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+kotlinApiVersion=1.8
+kotlinVersion=1.9.24
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,10 @@
 pluginManagement {
     includeBuild("git-based-versioning")
+
+    val kotlinVersion: String by settings
+    plugins {
+        kotlin("jvm") version "$kotlinVersion"
+    }
 }
 
 plugins {

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,15 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`		`-val kotlinApiVersion by extra { "1.7" }`
`15`		`-val kotlinVersion by extra { "$kotlinApiVersion.10" }`
`16`		`-`
	`14`	`+val kotlinApiVersion: String by project`
	`15`	`+val kotlinVersion: String by project`
`17`	`16`
`18`	`17`	`plugins {`
`19`	`18`	`groovy`
`20`	`19`	`java-gradle-plugin`
`21`	`20`	`kotlin-dsl`
`22`	`21`	`maven-publish`
`23`		`- kotlin("jvm") version "1.7.10"`
	`22`	`+ kotlin("jvm")`
`24`	`23`	`id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"`
`25`	`24`	`}`
`26`	`25`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+kotlinApiVersion=1.8`
	`2`	`+kotlinVersion=1.9.24`