chore: Move to Kotlin 1.9.0

Virelion · Jul 30, 2023 · 82ce14e · 82ce14e
1 parent cf2a358
commit 82ce14e
Show file tree

Hide file tree

Showing 14 changed files with 258 additions and 201 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-    kotlin("multiplatform") version "1.7.10" apply false
+    kotlin("multiplatform") version "1.9.0" apply false
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0" apply false
     id("com.gradle.plugin-publish") version "1.1.0" apply false
     id("nebula.release") version "13.2.1"

diff --git a/buildata-gradle-plugin/build.gradle.kts b/buildata-gradle-plugin/build.gradle.kts
@@ -44,7 +44,7 @@ val kspVersion: String by project
 dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("gradle-plugin-api"))
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
     implementation("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kspVersion")
     compileOnly("com.google.auto.service:auto-service:1.0.1")
     kapt("com.google.auto.service:auto-service:1.0.1")

diff --git a/buildata-ksp-plugin/build.gradle.kts b/buildata-ksp-plugin/build.gradle.kts
@@ -26,7 +26,6 @@ repositories {
 val kspVersion: String by project
 
 dependencies {
-    implementation(kotlin("stdlib"))
     implementation(kotlin("compiler-embeddable"))
     implementation("com.google.devtools.ksp:symbol-processing-api:$kspVersion")
     compileOnly("com.google.auto.service:auto-service:1.0.1")

diff --git a/...p-plugin/src/main/kotlin/io/github/virelion/buildata/ksp/path/StringNamePathIdentifier.kt b/...p-plugin/src/main/kotlin/io/github/virelion/buildata/ksp/path/StringNamePathIdentifier.kt
@@ -47,11 +47,11 @@ value class StringNamePathIdentifier(
     }
 
     private fun KSAnnotation.getFirstParamOfAnnotationAsString(): String? {
-        return arguments.firstOrNull()?.value?.safeAs<String>()
+        return arguments.firstOrNull()?.value as? String
     }
 
     private fun KSAnnotation.getFirstListElementOfAnnotationAsString(): String? {
-        return arguments.firstOrNull()?.value?.safeAs<List<String>>()?.firstOrNull()
+        return (arguments.firstOrNull()?.value as? List<String>)?.firstOrNull()
     }
 
     override fun toString(): String {

diff --git a/buildata-runtime/build.gradle.kts b/buildata-runtime/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
     kotlin("multiplatform")
     `maven-publish`
     id("org.jlleitschuh.gradle.ktlint")
-    id("org.jetbrains.dokka") version "1.8.10"
+    id("org.jetbrains.dokka") version "1.8.20"
     signing
 }
 
@@ -133,7 +133,7 @@ kotlin {
                 }
             }
 
-            val androidTest by getting {
+            val androidUnitTest by getting {
                 dependencies {
                     implementation(kotlin("test"))
                     implementation(kotlin("test-junit"))
@@ -200,9 +200,6 @@ afterEvaluate {
                 apply(from = "$rootDir/gradle/pom.gradle.kts")
                 val configurePOM: ((MavenPublication, Project) -> Unit) by extra
 
-                this.forEach {
-                    logger.warn(it.name)
-                }
                 this.getByName<MavenPublication>("androidRelease") {
                     configurePOM(this, project)
                 }
@@ -219,7 +216,6 @@ fun Project.configureAndroid() {
 
     configure<LibraryExtension> {
         namespace = "io.github.virelion"
-        buildToolsVersion = "29.0.2"
         compileSdkVersion = "android-29"
 
         defaultConfig {

diff --git a/buildata-runtime/src/androidMain/AndroidManifest.xml b/buildata-runtime/src/androidMain/AndroidManifest.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,8 @@
 group=io.github.virelion
 version=0.0.0-SNAPSHOT
 
-kspVersion= 1.8.20-RC2-1.0.9
+kspVersion= 1.9.0-1.0.12
 
 kotlin.native.ignoreDisabledTargets=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 
 org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
diff --git a/integration-test-project/build.gradle.kts b/integration-test-project/build.gradle.kts
@@ -5,12 +5,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:8.1.0")
     }
 }
 
 plugins {
-    val kotlinVersion = "1.8.20"
+    val kotlinVersion = "1.9.0"
     kotlin("multiplatform") version kotlinVersion apply false
     kotlin("jvm") version kotlinVersion apply false
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"

diff --git a/integration-test-project/gradle/wrapper/gradle-wrapper.jar b/integration-test-project/gradle/wrapper/gradle-wrapper.jar
diff --git a/integration-test-project/gradle/wrapper/gradle-wrapper.properties b/integration-test-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Jul 20 17:41:23 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip