Bump Kotlin, Gradle version; various improvements to build setup

gradle.properties

@@ -2,4 +2,6 @@ group=com.daugeldauge.kinzhal
 version=0.0.5
 
 kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
+
+org.gradle.configuration-cache=true
+org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

kinzhal-annotations/build.gradle.kts

@@ -9,13 +9,21 @@ repositories {
 
 kotlin {
     jvm()
-    ios()
+    linuxX64()
+
+    iosX64()
+    iosArm64()
     iosSimulatorArm64()
+
     macosArm64()
     macosX64()
-    watchos()
+
+    watchosArm64()
+    watchosX64()
+    watchosArm32()
     watchosSimulatorArm64()
-    tvos()
+
+    tvosArm64()
+    tvosX64()
     tvosSimulatorArm64()
-    linuxX64()
 }

kinzhal-processor/build.gradle.kts

@@ -8,22 +8,18 @@ repositories {
 }
 
 kotlin {
-    sourceSets {
-        jvm()
+    jvm()
 
-        getByName("jvmMain") {
-            dependencies {
-                implementation(projects.kinzhalAnnotations)
-                implementation(libs.ksp.symbolProcessingApi)
-                implementation(libs.kotlinpoet)
-            }
+    sourceSets {
+        jvmMain.dependencies {
+            implementation(projects.kinzhalAnnotations)
+            implementation(libs.ksp.symbolProcessingApi)
+            implementation(libs.kotlinpoet)
         }
 
-        getByName("jvmTest") {
-            dependencies {
-                implementation(kotlin("test"))
-                implementation(libs.compileTestingKsp)
-            }
+        jvmTest.dependencies {
+            implementation(kotlin("test"))
+            implementation(libs.compileTestingKsp)
         }
     }
 }

sample/build.gradle.kts

@@ -1,4 +1,5 @@
-@Suppress("DSL_SCOPE_VIOLATION") // https://youtrack.jetbrains.com/issue/KTIJ-19369
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
+
 plugins {
     alias(libs.plugins.ksp)
     kotlin("multiplatform")
@@ -11,27 +12,23 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    ksp(kinzhalDependency(projects.kinzhalProcessor))
-}
-
 kotlin {
     sourceSets {
         jvm()
-        ios()
+        iosX64()
+        iosArm64()
+        iosSimulatorArm64()
         macosX64()
 
-        getByName("commonMain") {
+        commonMain {
             dependencies {
                 implementation(kinzhalDependency(projects.kinzhalAnnotations))
             }
 
-            if (System.getProperty("idea.sync.active") != null) {
-                kotlin.srcDir("$buildDir/generated/ksp/jvm/jvmMain/kotlin") // only needed for IDE to see generated code // TODO figure out how to avoid this
-            }
+            kotlin.srcDir(layout.buildDirectory.dir("generated/ksp/metadata/commonMain/kotlin")) // only needed for IDE to see generated code // TODO figure out how to avoid this
         }
 
-        getByName("commonTest") {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
@@ -40,14 +37,23 @@ kotlin {
     }
 }
 
+dependencies  {
+    kspCommonMainMetadata(kinzhalDependency(projects.kinzhalProcessor))
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().configureEach {
+    if (this !is KotlinCompileCommon) {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+
+    kotlinOptions.allWarningsAsErrors = true
+}
+
+
 fun kinzhalDependency(project: ProjectDependency): Any {
     return if (!hasProperty("useSnapshotForSample")) {
         project
     } else {
         "${project.group}:${project.name}:$version-SNAPSHOT"
     }
 }
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.allWarningsAsErrors = true
-}

sample/src/commonMain/kotlin/com/daugeldauge/kinzhal/sample/graph/ExternalComponent.kt

@@ -2,7 +2,6 @@ package com.daugeldauge.kinzhal.sample.graph
 
 import com.daugeldauge.kinzhal.annotations.Component
 import com.daugeldauge.kinzhal.sample.graph.network.DeezerApi
-import com.daugeldauge.kinzhal.sample.graph.network.HttpClient
 import com.daugeldauge.kinzhal.sample.graph.network.HttpClientScope
 import com.daugeldauge.kinzhal.sample.graph.network.NetworkModule
 

settings.gradle.kts

@@ -7,13 +7,12 @@ pluginManagement {
 }
 
 dependencyResolutionManagement {
-    @Suppress("UnstableApiUsage")
     versionCatalogs {
         create("libs") {
-            val kotlinVersion = "1.8.0"
+            val kotlinVersion = "1.9.21"
             version("kotlin", kotlinVersion)
 
-            val kspVersion = "$kotlinVersion-1.0.9"
+            val kspVersion = "$kotlinVersion-1.0.15"
 
             library("kotlinpoet", "com.squareup:kotlinpoet:1.9.0")
             library("compileTestingKsp", "com.github.tschuchortdev:kotlin-compile-testing-ksp:1.4.4")