chore: update jdk to 21

.github/workflows/docs-deploy.yml

@@ -26,10 +26,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Prepare Java 17
+      - name: Prepare Java 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           java-package: jdk
           distribution: 'temurin'
           cache: 'gradle'

build.gradle.kts

@@ -1,6 +1,8 @@
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     autowire(libs.plugins.android.application) apply false
@@ -50,6 +52,19 @@ libraryProjects {
     }
 }
 
+allprojects {
+    tasks.withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+            freeCompilerArgs.addAll(
+                "-Xno-param-assertions",
+                "-Xno-call-assertions",
+                "-Xno-receiver-assertions"
+            )
+        }
+    }
+}
+
 fun libraryProjects(action: Action<in Project>) {
     val libraries = listOf(
         Libraries.PANGUTEXT_ANDROID,

demo-android/build.gradle.kts

@@ -25,14 +25,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs = listOf(
-            "-Xno-param-assertions",
-            "-Xno-call-assertions",
-            "-Xno-receiver-assertions"
-        )
-    }
     buildFeatures {
         buildConfig = true
         viewBinding = true

gradle.properties

@@ -3,7 +3,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 kotlin.code.style=official
-kotlin.incremental.useClasspathSnapshot=true
 # Project Configuration
 project.name=PanguText
 project.url=https://github.com/BetterAndroid/PanguText

gradle/sweet-dependency/sweet-dependency-config.yaml

@@ -13,13 +13,13 @@ repositories:
 plugins:
   com.android.application:
     alias: android-application
-    version: 8.9.3
+    version: 8.12.1
   com.android.library:
     alias: android-library
     version-ref: com.android.application
   org.jetbrains.kotlin.android:
     alias: kotlin-android
-    version: 2.1.10
+    version: 2.2.10
   org.jetbrains.dokka:
     alias: kotlin-dokka
     version: 1.9.20

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

pangutext-android/build.gradle.kts

@@ -27,14 +27,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs = listOf(
-            "-Xno-param-assertions",
-            "-Xno-call-assertions",
-            "-Xno-receiver-assertions"
-        )
-    }
 }
 
 dependencies {

pangutext-android/src/main/java/com/highcapable/pangutext/android/core/PanguMarginSpan.kt

@@ -39,7 +39,7 @@ import kotlin.math.round
  * Pangu span with margin.
  * @param margin the margin size (px).
  */
-internal class PanguMarginSpan(@Px val margin: Int) : ReplacementSpan() {
+internal class PanguMarginSpan(@param:Px val margin: Int) : ReplacementSpan() {
 
     internal companion object {
 

settings.gradle.kts

@@ -8,7 +8,7 @@ pluginManagement {
 }
 plugins {
     id("com.highcapable.sweetdependency") version "1.0.4"
-    id("com.highcapable.sweetproperty") version "1.0.5"
+    id("com.highcapable.sweetproperty") version "1.0.8"
 }
 sweetProperty {
     rootProject { all { isEnable = false } }