From 4f478a3ca20938c5e9fc5dc4765e8fd9daf8439e Mon Sep 17 00:00:00 2001 From: Oleg Yukhnevich Date: Fri, 1 Nov 2024 10:59:52 +0200 Subject: [PATCH 1/2] Update KGP to 2.1.10 --- .../kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt | 3 ++- gradle/libs.versions.toml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt b/build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt index 0a2088a378..2fdfd4f083 100644 --- a/build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt +++ b/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,7 +17,7 @@ fun Project.configureGradleKotlinCompatibility() { if (!dokkaBuild.enforceGradleKotlinCompatibility.get()) return extensions.configure("kotlin") { - @OptIn(ExperimentalKotlinGradlePluginApi::class) + @OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBuildToolsApi::class) compilerVersion.set("2.0.20") coreLibrariesVersion = "2.0.20" compilerOptions { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dc76343dfd..c60a1115d6 100644 --- a/gradle/libs.versions.toml +++ b/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.10" # 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" From b1dd1f26df8929ffe094a93b1a191533d2e5c4e9 Mon Sep 17 00:00:00 2001 From: Oleg Yukhnevich Date: Fri, 31 Jan 2025 17:00:24 +0200 Subject: [PATCH 2/2] Reduce Gradle memory usage --- .github/workflows/preview-publish-ga.yml | 4 ++-- .github/workflows/preview-publish-web-s3.yml | 4 ++-- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/preview-publish-ga.yml b/.github/workflows/preview-publish-ga.yml index 0ea176f310..a71f199254 100644 --- a/.github/workflows/preview-publish-ga.yml +++ b/.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 diff --git a/.github/workflows/preview-publish-web-s3.yml b/.github/workflows/preview-publish-web-s3.yml index c0aedf6a7f..4637b0b472 100644 --- a/.github/workflows/preview-publish-web-s3.yml +++ b/.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 diff --git a/gradle.properties b/gradle.properties index e8301bcbf8..41554adaa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,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