From 2aea3855038da721ee1b8374992532a79d1d57a8 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Mon, 14 Jul 2025 10:42:43 +0200 Subject: [PATCH 1/3] Enable Gradle configuration and build caches in CI workflows --- .github/workflows/codeql.yml | 2 +- .github/workflows/test-dev.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fd2c5c4..40d1ad2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -53,7 +53,7 @@ jobs: # uses: github/codeql-action/autobuild@v2 - name: Build - run: ./gradlew --no-daemon lib:assemble + run: ./gradlew --no-daemon --configuration-cache --build-cache lib:assemble - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml index cbe2037..1ad7e7c 100644 --- a/.github/workflows/test-dev.yml +++ b/.github/workflows/test-dev.yml @@ -18,7 +18,7 @@ jobs: - uses: gradle/actions/setup-gradle@v3 - name: Check - run: ./gradlew lib:check + run: ./gradlew --configuration-cache --build-cache lib:check test_on_emulator: name: Tests with emulator @@ -45,4 +45,4 @@ jobs: key: avd-${{ hashFiles('lib/build.gradle.kts') }} # gradle-managed devices are defined there - name: Run device tests - run: ./gradlew --no-daemon lib:virtualCheck + run: ./gradlew --configuration-cache --build-cache lib:virtualCheck From 76c994c7e048e6d08306ceee7de93db6f308f46a Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Mon, 14 Jul 2025 10:51:03 +0200 Subject: [PATCH 2/3] Update Dokka version and configuration --- .github/workflows/build-kdoc.yml | 2 +- build.gradle.kts | 3 +-- gradle.properties | 6 ++---- gradle/libs.versions.toml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-kdoc.yml b/.github/workflows/build-kdoc.yml index 92643fc..ec07021 100644 --- a/.github/workflows/build-kdoc.yml +++ b/.github/workflows/build-kdoc.yml @@ -23,7 +23,7 @@ jobs: - uses: gradle/actions/setup-gradle@v3 - name: Build KDoc - run: ./gradlew --no-daemon --no-configuration-cache lib:dokkaHtml + run: ./gradlew --build-cache --configuration-cache lib:dokkaGenerate - name: Publish KDoc if: success() diff --git a/build.gradle.kts b/build.gradle.kts index 681f891..2b23253 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,8 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.compose.compiler) apply false - alias(libs.plugins.dokka) apply false alias(libs.plugins.kotlin.android) apply false } group = "at.bitfire" -version = System.getenv("GIT_COMMIT") +version = System.getenv("GIT_COMMIT") \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b6c5ee8..b1489ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,7 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=512m org.gradle.parallel=true -# configuration cache [https://developer.android.com/build/optimize-your-build#use-the-configuration-cache-experimental] -org.gradle.unsafe.configuration-cache=true -org.gradle.unsafe.configuration-cache-problems=warn - # Android android.useAndroidX=true +# Dokka +org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 142c554..47b8b01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ androidx-test-runner = "1.6.2" androidx-test-rules = "1.6.1" conscrypt = "2.5.3" compose-bom = "2025.06.01" -dokka = "1.9.20" +dokka = "2.0.0" junit = "4.13.2" kotlin = "2.2.0" mockk = "1.14.4" From 37635cc86b251323fb26bb3472f9869e83d3b17e Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Mon, 14 Jul 2025 11:03:45 +0200 Subject: [PATCH 3/3] Update virtual device API level to 35 --- lib/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 8898602..a550111 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -52,7 +52,7 @@ android { localDevices { create("virtual") { device = "Pixel 3" - apiLevel = 33 + apiLevel = 35 systemImageSource = "aosp-atd" } }