build: Update Kotlin to 1.9.10

Griefed · Sep 16, 2023 · 8485787 · 8485787
1 parent 4d2c382
commit 8485787
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -24,8 +24,8 @@ FileInputStream(file("../gradle.properties")).use {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${props.getProperty("kotlinVersion")}")
     implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.10")
-    implementation("org.jetbrains.kotlin:kotlin-allopen:1.8.21")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
+    implementation("org.jetbrains.kotlin:kotlin-allopen:1.9.10")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.0")
     implementation("org.panteleyev:jpackage-gradle-plugin:1.5.2")
     implementation("com.github.jk1:gradle-license-report:2.5")
     implementation("org.siouan.frontend-jdk11:org.siouan.frontend-jdk11.gradle.plugin:6.0.0")
@@ -35,7 +35,6 @@ dependencies {
 tasks.compileKotlin<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     logger.lifecycle("Configuring $name with version ${project.getKotlinPluginVersion()} in project ${project.name}")
     kotlinOptions {
-        @Suppress("SpellCheckingInspection")
         val list = freeCompilerArgs.toMutableList()
         list.add("-Xjsr305=strict")
         freeCompilerArgs = list.toList()
@@ -49,7 +48,6 @@ tasks.compileKotlin<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 tasks.compileTestKotlin<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     logger.lifecycle("Configuring $name with version ${project.getKotlinPluginVersion()} in project ${project.name}")
     kotlinOptions {
-        @Suppress("SpellCheckingInspection")
         val list = freeCompilerArgs.toMutableList()
         list.add("-Xjsr305=strict")
         freeCompilerArgs = list.toList()

diff --git a/buildSrc/src/main/kotlin/de/griefed/common/gradle/constant/Version.kt b/buildSrc/src/main/kotlin/de/griefed/common/gradle/constant/Version.kt
@@ -5,4 +5,4 @@ const val JDK_VERSION = "17"
 
 // is used to set the "languageVersion" and "apiVersion" in KotlinCompile
 // should be the same as the embedded Kotlin runtime version in Gradle
-const val KOTLIN_VERSION = "1.8"
+const val KOTLIN_VERSION = "1.9"
diff --git a/gradle.properties b/gradle.properties
@@ -6,8 +6,8 @@ org.gradle.caching=true
 kotlin.code.style=official
 kotlin.js.generate.executable.default=false
 kotlin.build.report.enable=true
-kotlinVersion=1.8.21
-kotlinMajor=1.8
+kotlinVersion=1.9.10
+kotlinMajor=1.9
 jdkVersion=17
 
 group=de.griefed.serverpackcreator

diff --git a/serverpackcreator-api/src/commonMain/kotlin/de/griefed/serverpackcreator/api/ApiWrapper.kt b/serverpackcreator-api/src/commonMain/kotlin/de/griefed/serverpackcreator/api/ApiWrapper.kt
@@ -41,13 +41,23 @@ expect class ApiWrapper {
     val tomlScanner: TomlScanner
 
     var webUtilities: WebUtilities?
+        private set
     var utilities: Utilities?
+        private set
     var versionMeta: VersionMeta?
+        private set
     var configurationHandler: ConfigurationHandler?
+        private set
     var apiPlugins: ApiPlugins?
+        private set
     var serverPackHandler: ServerPackHandler?
+        private set
     var modScanner: ModScanner?
+        private set
     var annotationScanner: AnnotationScanner?
+        private set
     var fabricScanner: FabricScanner?
+        private set
     var quiltScanner: QuiltScanner?
+        private set
 }