Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update KGP to 2.1.10 #4014

Open
wants to merge 2 commits into
base: compiler-2.0.20
Choose a base branch
from
Open

Update KGP to 2.1.10 #4014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f478a3
Update KGP to 2.1.10
whyoleg Nov 1, 2024
b1dd1f2
Reduce Gradle memory usage
whyoleg Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/preview-publish-ga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview-publish-web-s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion build-logic/src/main/kotlin/dokkabuild/utils/gradleKotlinCompatibility.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,7 +17,7 @@ fun Project.configureGradleKotlinCompatibility() {
if (!dokkaBuild.enforceGradleKotlinCompatibility.get()) return

extensions.configure<KotlinJvmProjectExtension>("kotlin") {
@OptIn(ExperimentalKotlinGradlePluginApi::class)
@OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBuildToolsApi::class)
compilerVersion.set("2.0.20")
coreLibrariesVersion = "2.0.20"
compilerOptions {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading