chore: bump dependencies & configuration

Author: fankes

build.gradle.kts

@@ -1,17 +1,52 @@
+import com.android.build.api.dsl.CommonExtension
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
+import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import org.jetbrains.dokka.gradle.DokkaTask
+import com.vanniktech.maven.publish.SourcesJar
+import org.jetbrains.dokka.gradle.DokkaExtension
+import org.jetbrains.dokka.gradle.engine.plugins.DokkaHtmlPluginParameters
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.dokka) apply false
     alias(libs.plugins.maven.publish) apply false
 }
 
+val androidApplicationPluginId = libs.plugins.android.application.get().pluginId
+val androidLibraryPluginId = libs.plugins.android.library.get().pluginId
+val dokkaPluginId = libs.plugins.kotlin.dokka.get().pluginId
+
+allprojects {
+    fun Project.configureAndroidJvm() {
+        configure<CommonExtension> {
+            compileOptions.sourceCompatibility = JavaVersion.VERSION_17
+            compileOptions.targetCompatibility = JavaVersion.VERSION_17
+        }
+    }
+
+    plugins.withId(androidLibraryPluginId) {
+        configureAndroidJvm()
+    }
+
+    plugins.withId(androidApplicationPluginId) {
+        configureAndroidJvm()
+    }
+
+    tasks.withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+            freeCompilerArgs.addAll(
+                "-Xno-param-assertions",
+                "-Xno-call-assertions",
+                "-Xno-receiver-assertions"
+            )
+        }
+    }
+}
+
 libraryProjects {
     afterEvaluate {
         configure<PublishingExtension> {
@@ -32,41 +67,34 @@ libraryProjects {
         }
 
         configure<MavenPublishBaseExtension> {
-            configure(AndroidSingleVariantLibrary(publishJavadocJar = false))
+            configure(AndroidSingleVariantLibrary(JavadocJar.None(), SourcesJar.Sources()))
         }
     }
 
-    tasks.withType<DokkaTask>().configureEach {
-        val configuration = """{ "footerMessage": "PanguText | Apache-2.0 License | Copyright (C) 2019 HighCapable" }"""
-        pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to configuration))
-    }
-
-    tasks.register("publishKDoc") {
-        group = "documentation"
-        dependsOn("dokkaHtml")
+    plugins.withId(dokkaPluginId) {
+        configure<DokkaExtension> {
+            dokkaPublications.named("html") {
+                outputDirectory.set(layout.buildDirectory.dir("dokka/html"))
+            }
+            pluginsConfiguration.withType<DokkaHtmlPluginParameters>().configureEach {
+                footerMessage.set("PanguText | Apache-2.0 License | Copyright (C) 2019 HighCapable")
+            }
+        }
 
-        doLast {
-            val docsDir = rootProject.projectDir
-                .resolve("docs-source")
-                .resolve("dist")
-                .resolve("KDoc")
-                .resolve(project.name)
+        tasks.register("publishKDoc") {
+            group = "documentation"
+            dependsOn("dokkaGeneratePublicationHtml")
 
-            if (docsDir.exists()) docsDir.deleteRecursively() else docsDir.mkdirs()
-            layout.buildDirectory.dir("dokka/html").get().asFile.copyRecursively(docsDir)
-        }
-    }
-}
+            doLast {
+                val docsDir = rootProject.projectDir
+                    .resolve("docs-source")
+                    .resolve("dist")
+                    .resolve("KDoc")
+                    .resolve(project.name)
 
-allprojects {
-    tasks.withType<KotlinJvmCompile>().configureEach {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-            freeCompilerArgs.addAll(
-                "-Xno-param-assertions",
-                "-Xno-call-assertions",
-                "-Xno-receiver-assertions"
-            )
+                if (docsDir.exists()) docsDir.deleteRecursively() else docsDir.mkdirs()
+                layout.buildDirectory.dir("dokka/html").get().asFile.copyRecursively(docsDir)
+            }
         }
     }
 }

demo-android/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -21,10 +20,6 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 
     buildFeatures {
         buildConfig = true

gradle/libs.versions.toml

@@ -1,15 +1,16 @@
 [versions]
-agp = "8.13.2"
-kotlin = "2.2.21"
-# noinspection NewerVersionAvailable
-dokka = "1.9.20"
-maven-publish = "0.35.0"
+agp = "9.2.1"
+dokka = "2.2.0"
+maven-publish = "0.36.0"
 betterandroid-ui-component = "1.0.10"
 betterandroid-ui-component-adapter = "1.0.1"
 betterandroid-ui-extension = "1.0.9"
 betterandroid-system-extension = "1.0.4"
 kavaref-core = "1.0.2"
 kavaref-extension = "1.0.2"
+# The project current support min sdk version is 21,
+# suppress the warning about using newer versions of dependencies that may require higher min sdk version.
+# noinspection GradleDependency
 androidx-core = "1.17.0"
 androidx-appcompat = "1.7.1"
 # noinspection GradleDependency
@@ -22,7 +23,6 @@ androidx-test-espresso-core = "3.7.0"
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
 

pangutext-android/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.maven.publish)
 }
@@ -23,10 +22,6 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 }
 
 dependencies {