gradle 9, jdk 21

Author: markusressel

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: 'gradle'
       - name: Perform base checks
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: 'gradle'
       - name: Execute unit tests
@@ -39,7 +39,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: 'gradle'
 

.jitpack.yml

@@ -1 +1 @@
-jdk: openjdk17
+jdk: openjdk21

build-logic/convention/build.gradle.kts

@@ -11,13 +11,13 @@ version = "0.1.0"
 java {
     // Up to Java 11 APIs are available through desugaring
     // https://developer.android.com/studio/write/java11-minimal-support-table
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_17)
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 

build-logic/convention/src/main/kotlin/AndroidLibraryPublishingConventionPlugin.kt

@@ -9,15 +9,16 @@ import org.gradle.kotlin.dsl.create
 class AndroidLibraryPublishingConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            extensions.configure<LibraryExtension> {
-                with(pluginManager) {
-                    apply("maven-publish")
-                }
-                publishing {
-                    singleVariant("release") {
-                        group = "com.github.markusressel.KodeEditor"
-                        withJavadocJar()
-                        withSourcesJar()
+            pluginManager.apply("maven-publish")
+
+            extensions.apply {
+                configure<LibraryExtension> {
+                    publishing {
+                        singleVariant("release") {
+                            group = "com.github.markusressel.KodeEditor"
+                            withJavadocJar()
+                            withSourcesJar()
+                        }
                     }
                 }
                 configure<PublishingExtension> {

build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidCompose.kt

@@ -13,13 +13,13 @@ import java.io.File
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
     pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
 
     commonExtension.apply {
-        buildFeatures {
+        buildFeatures.apply {
             compose = true
         }
 

build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/KotlinAndroid.kt

@@ -7,6 +7,7 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 const val COMPILE_SDK = 36
@@ -16,20 +17,24 @@ const val TARGET_SDK = 34
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
     commonExtension.apply {
         compileSdk = COMPILE_SDK
 
-        defaultConfig {
-            minSdk = 21
+        kotlinExtension.apply {
+            jvmToolchain(21)
         }
 
-        compileOptions {
+        defaultConfig.apply {
+            minSdk = 23
+        }
+
+        compileOptions.apply {
             // Up to Java 11 APIs are available through desugaring
             // https://developer.android.com/studio/write/java11-minimal-support-table
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
+            sourceCompatibility = JavaVersion.VERSION_21
+            targetCompatibility = JavaVersion.VERSION_21
             isCoreLibraryDesugaringEnabled = true
         }
     }
@@ -38,7 +43,7 @@ internal fun Project.configureKotlinAndroid(
     tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
             // Set JVM target to 11
-            jvmTarget.set(JvmTarget.JVM_17)
+            jvmTarget.set(JvmTarget.JVM_21)
             // Treat all Kotlin warnings as errors (disabled by default)
             // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
             val warningsAsErrors: String? by project
@@ -64,6 +69,6 @@ internal fun Project.configureKotlinAndroid(
  */
 internal fun Project.configureKotlinAndroidToolchain() {
     extensions.configure<KotlinAndroidProjectExtension> {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 }

gradle.properties

@@ -14,4 +14,14 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=false
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -1,25 +1,25 @@
 [versions]
-activityCompose = "1.11.0"
+activityCompose = "1.12.4"
 androidComposeMaterial3 = "1.4.0"
 androidDesugarJdkLibs = "2.1.5"
-androidGradlePlugin = "8.13.0"
+androidGradlePlugin = "9.0.0"
 androidxAnnotation = "1.9.1"
 androidxAppCompat = "1.7.1"
-androidxComposeBom = "2025.10.01"
-androidxComposeUi = "1.9.4"
-androidxComposeUiText = "1.9.4"
-androidxLifecycle = "2.9.4"
+androidxComposeBom = "2026.02.01"
+androidxComposeUi = "1.10.4"
+androidxComposeUiText = "1.10.4"
+androidxLifecycle = "2.10.0"
 androidxTestExtJunit = "1.3.0"
 androidxTestEspressoCore = "3.7.0"
 dokkaGradlePlugin = "2.1.0"
 fuel = "2.3.1"
 flowbindingAndroid = "1.2.0"
 junit4 = "4.13.2"
-kotlin = "2.2.21"
+kotlin = "2.3.10"
 kotlinCoroutinesCore = "1.10.2"
 kotlinCoroutinesAndroid = "1.10.2"
 kodehighlighter = "4.0.4"
-ksp = "2.3.0"
+ksp = "2.3.2"
 material = "1.13.0"
 zoomlayout = "1.9.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip