Merge pull request #1606 from joreilly/bump-gradle-and-kotlin

bump Kotlin, Gradle and a bunch of other things

Author: joreilly

backend/datastore/build.gradle.kts

@@ -1,8 +1,10 @@
+import compat.patrouille.configureJavaCompatibility
+
 plugins {
   kotlin("multiplatform")
 }
 
-configureCompilerOptions(17)
+configureJavaCompatibility(17)
 
 kotlin {
   jvm()

backend/service-graphql/build.gradle.kts

@@ -1,3 +1,4 @@
+import compat.patrouille.configureJavaCompatibility
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -9,7 +10,7 @@ plugins {
   id("com.apollographql.execution")
 }
 
-configureCompilerOptions(17)
+configureJavaCompatibility(17)
 
 dependencies {
   implementation(libs.spring.boot.starter.webflux)

backend/service-graphql/src/main/kotlin/dev/johnoreilly/confetti/backend/DefaultApplication.kt

@@ -3,9 +3,9 @@
 package dev.johnoreilly.confetti.backend
 
 import com.apollographql.apollo.api.ExecutionContext
-import com.apollographql.execution.ExecutableSchema
-import com.apollographql.execution.GraphQLResponse
-import com.apollographql.execution.InMemoryPersistedDocumentCache
+import com.apollographql.apollo.execution.ExecutableSchema
+import com.apollographql.apollo.execution.GraphQLResponse
+import com.apollographql.apollo.execution.InMemoryPersistedDocumentCache
 import com.apollographql.execution.reporting.ApolloReportingInstrumentation
 import com.apollographql.execution.reporting.ApolloReportingOperationContext
 import com.apollographql.execution.spring.apolloSandboxRoutes

backend/service-graphql/src/main/kotlin/dev/johnoreilly/confetti/backend/graphql/model.kt

@@ -3,9 +3,9 @@ package dev.johnoreilly.confetti.backend.graphql
 import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.apollo.ast.GQLStringValue
 import com.apollographql.apollo.ast.GQLValue
-import com.apollographql.execution.Coercing
+import com.apollographql.apollo.execution.Coercing
+import com.apollographql.apollo.execution.ExternalValue
 import com.apollographql.execution.annotation.*
-import com.apollographql.execution.ExternalValue
 import com.google.firebase.auth.FirebaseAuth
 import dev.johnoreilly.confetti.backend.*
 import dev.johnoreilly.confetti.backend.datastore.DDirection
@@ -20,15 +20,15 @@ import kotlinx.datetime.LocalDateTime as KotlinxLocalDateTime
  */
 @GraphQLScalar(InstantCoercing::class)
 typealias Instant = KotlinxInstant
-@GraphQLScalar(LocalDateCoercing::class)
 /**
  * A type representing a formatted kotlinx.datetime.LocalDate
  */
+@GraphQLScalar(LocalDateCoercing::class)
 typealias LocalDate = KotlinxLocalDate
-@GraphQLScalar(LocalDateTimeCoercing::class)
 /**
  * A type representing a formatted kotlinx.datetime.LocalDateTime
  */
+@GraphQLScalar(LocalDateTimeCoercing::class)
 typealias LocalDateTime = KotlinxLocalDateTime
 
 object InstantCoercing : Coercing<Instant> {

backend/service-import/build.gradle.kts

@@ -1,11 +1,12 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import compat.patrouille.configureJavaCompatibility
 
 plugins {
   kotlin("multiplatform")
   id("org.jetbrains.kotlin.plugin.serialization")
 }
 
-configureCompilerOptions(17)
+configureJavaCompatibility(17)
 
 kotlin {
   jvm()

build-logic/build.gradle.kts

@@ -1,9 +1,8 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    alias(libs.plugins.kotlin19)
-    alias(libs.plugins.ksp19)
+    alias(libs.plugins.kgp.jvm)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.gratatouille)
+    alias(libs.plugins.compat.patrouille)
 }
 
 dependencies {
@@ -33,13 +32,12 @@ dependencies {
     implementation(libs.google.cloud.run)
     implementation(libs.kotlinx.datetime)
     implementation(libs.roborazzi.gradle.plugin)
+    implementation(libs.compat.patrouille)
 }
 
 group = "build-logic"
-tasks.withType(JavaCompile::class.java).configureEach {
-    this.options.release.set(17)
-}
 
-tasks.withType(KotlinCompile::class.java).configureEach {
-    this.kotlinOptions.jvmTarget = "17"
+compatPatrouille {
+    java(17)
+    kotlin(embeddedKotlinVersion)
 }

build-logic/src/main/kotlin/options.kt

@@ -1,44 +1,6 @@
-import com.android.build.gradle.BaseExtension
-import org.gradle.api.JavaVersion
+import compat.patrouille.configureJavaCompatibility
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
-private fun Int.toJavaVersion(): String = when(this) {
-    8 -> "1.8"
-    else -> toString()
-}
 fun Project.configureCompilerOptions(jvmVersion: Int = 17) {
-    tasks.withType(KotlinCompile::class.java).configureEach {
-        it.kotlinOptions {
-            (this as? KotlinJvmOptions)?.let {
-                it.jvmTarget = jvmVersion.toJavaVersion()
-            }
-        }
-    }
-
-//    project.tasks.withType(JavaCompile::class.java).configureEach {
-//        // Ensure "org.gradle.jvm.version" is set to "8" in Gradle metadata of jvm-only modules.
-//        it.options.release.set(jvmVersion)
-//    }
-
-    extensions.getByName("java").apply {
-        this as JavaPluginExtension
-        toolchain {
-            it.languageVersion.set(JavaLanguageVersion.of(17))
-        }
-    }
-
-//    extensions.findByName("android")?.apply{
-//        this as BaseExtension
-//        compileOptions {
-//            it.sourceCompatibility = JavaVersion.toVersion(jvmVersion.toJavaVersion())
-//            it.targetCompatibility = JavaVersion.toVersion(jvmVersion.toJavaVersion())
-//        }
-//    }
+    project.configureJavaCompatibility(javaVersion = jvmVersion)
 }

gradle.properties

@@ -22,6 +22,8 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 
 xcodeproj=./iosApp
 
+ksp.allow.all.target.configuration=false
+
 # KMMBridge
 LIBRARY_VERSION=0.9
 GROUP=dev.johnoreilly.confetti

gradle/libs.versions.toml

@@ -1,11 +1,10 @@
 [versions]
-kotlin19 = "1.9.25"
-ksp19 = "1.9.25-1.0.20"
 kotlin = "2.1.20"
-ksp = "2.1.20-1.0.31"
+ksp = "2.1.20-2.0.0"
 kotlinx-coroutines = "1.10.1"
 kotlinx-datetime = "0.6.2"
-apollo-kotlin-execution = "0.1.1-SNAPSHOT-3e89cc694ab96bae7b4c1b7b6394c211065551c1"
+apollo-kotlin-execution = "0.1.1-SNAPSHOT-fd7fa806b95c5b9046494989a7dd478c47237e12"
+compatPatrouille = "0.0.0"
 
 agp = "8.8.0"
 activity-compose = "1.10.1"
@@ -200,7 +199,7 @@ plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serializat
 plugin-kotlin-spring = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
 plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
 plugin-spring-boot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version = "3.4.4" }
-plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.9.11" }
+plugin-wire = { module = "com.squareup.wire:wire-gradle-plugin", version = "5.3.1" }
 plugin-compose-multiplatform = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-multiplatform" }
 roborazzi-gradle-plugin = { module = "io.github.takahirom.roborazzi:roborazzi-gradle-plugin", version.ref = "roborazzi" }
 scrimage-core = "com.sksamuel.scrimage:scrimage-core:4.3.0"
@@ -224,7 +223,7 @@ kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 tink = "com.google.crypto.tink:tink:1.17.0"
 jib-core = "com.google.cloud.tools:jib-core:0.27.2"
 google-cloud-run = "com.google.cloud:google-cloud-run:0.54.0"
-
+compat-patrouille = { module = "com.gradleup.compat.patrouille:com.gradleup.compat.patrouille.gradle.plugin", version.ref = "compatPatrouille" }
 generativeai = { module = "dev.shreyaspatil.generativeai:generativeai-google", version.ref = "generativeai" }
 
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
@@ -242,9 +241,7 @@ jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-multip
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "compose-hot-reload" }
 screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}
-#noinspection SimilarGradleDependency
+kgp-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-#noinspection SimilarGradleDependency
-ksp19 = { id = "com.google.devtools.ksp", version.ref = "ksp19" }
-kotlin19 = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin19" }
 gratatouille = { id = "com.gradleup.gratatouille", version = "0.0.4" }
+compat-patrouille = { id = "com.gradleup.compat.patrouille", version.ref = "compatPatrouille" }