Update KGP to 2.1.21

.github/workflows/preview-publish-ga.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: Document coroutines
-        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxCoroutines --stacktrace "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=500m"
+        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxCoroutines --stacktrace
         env:
           DOKKA_TEST_OUTPUT_PATH: ${{ github.workspace }}/dokka/coroutines
       - name: Copy files to GitHub Actions Artifacts
@@ -50,7 +50,7 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: Document serialization
-        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxSerialization --stacktrace "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=500m"
+        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxSerialization --stacktrace
         env:
           DOKKA_TEST_OUTPUT_PATH: ${{ github.workspace }}/dokka/serialization
       - name: Copy files to GitHub Actions Artifacts

.github/workflows/preview-publish-web-s3.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: Document coroutines
-        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxCoroutines --stacktrace "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=500m"
+        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxCoroutines --stacktrace
         env:
           DOKKA_TEST_OUTPUT_PATH: ${{ github.workspace }}/dokka/coroutines
       - name: Configure AWS credentials for S3 access
@@ -49,7 +49,7 @@ jobs:
         with:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: Document serialization
-        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxSerialization --stacktrace "-Dorg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=500m"
+        run: ./gradlew :dokka-integration-tests:gradle:testExternalProjectKotlinxSerialization --stacktrace
         env:
           DOKKA_TEST_OUTPUT_PATH: ${{ github.workspace }}/dokka/serialization
       - name: Configure AWS credentials for S3 access

build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt

@@ -6,6 +6,7 @@ package dokkabuild.utils
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dokkaBuild
+import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -16,9 +17,9 @@ fun Project.configureGradleKotlinCompatibility() {
     if (!dokkaBuild.enforceGradleKotlinCompatibility.get()) return
 
     extensions.configure<KotlinJvmProjectExtension>("kotlin") {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-        compilerVersion.set("2.0.20")
-        coreLibrariesVersion = "2.0.20"
+        @OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBuildToolsApi::class)
+        compilerVersion.set("2.0.21")
+        coreLibrariesVersion = "2.0.21"
         compilerOptions {
             languageVersion.set(KotlinVersion.fromVersion("1.4"))
             apiVersion.set(KotlinVersion.fromVersion("1.4"))

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt

@@ -14,7 +14,7 @@ open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArguments
 
 object TestedVersions {
 
-    val LATEST = BuildVersions("8.12.1", "2.1.10")
+    val LATEST = BuildVersions("8.12.1", "2.1.21")
 
     /**
      * All supported Gradle/Kotlin versions, including [LATEST]
@@ -41,7 +41,7 @@ object TestedVersions {
     val ANDROID =
         BuildVersions.permutations(
             gradleVersions = listOf("8.4"),
-            kotlinVersions = listOf("2.1.10", "2.0.21"),
+            kotlinVersions = listOf("2.1.21", "2.0.21"),
             androidGradlePluginVersions = listOf("8.3.0")
         ) + BuildVersions.permutations(
             gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
@@ -68,7 +68,7 @@ object TestedVersions {
         "1.9.23" to "18.2.0-pre.682",
         "2.0.0" to "18.2.0-pre.726",
         "2.0.21" to "18.3.1-pre.758",
-        "2.1.10" to "2025.1.10-19.0.0",
+        "2.1.21" to "2025.6.2-19.1.0",
     )
 }
 

gradle.properties

@@ -15,7 +15,7 @@ kotlin.compiler.runViaBuildToolsApi=true
 kotlin.code.style=official
 
 # Gradle settings
-org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2g
+org.gradle.jvmargs=-Xmx2g
 org.gradle.caching=true
 org.gradle.configuration-cache-problems=warn
 org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -3,10 +3,9 @@
 # We use a different compiler version to compile modules and Gradle Plugin
 # to be able to use Kotlin Language/API version 1.4 to be compatible with Gradle 7.
 # The logic leaves in build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt
-gradlePlugin-kotlin = "2.0.20"
+gradlePlugin-kotlin = "2.1.21"
 # See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
-gradlePlugin-android = "7.1.3"
-gradlePlugin-dokka = "1.9.20"
+gradlePlugin-android = "7.3.1"
 
 kotlinx-coroutines = "1.7.3"
 kotlinx-collections-immutable = "0.3.6"