summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/ci-gradle.properties14
-rw-r--r--.github/workflows/dependency_sync.yml2
-rw-r--r--.github/workflows/deploy_github_releases.yml2
-rw-r--r--.github/workflows/deploy_library_releases.yml2
-rw-r--r--.github/workflows/deploy_snapshot.yml2
-rw-r--r--.github/workflows/draft_new_release.yml2
-rw-r--r--.github/workflows/pull_request.yml12
-rw-r--r--.github/workflows/sync_crowdin.yml2
-rw-r--r--.github/workflows/update_publicsuffix_data.yml2
-rw-r--r--build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts6
10 files changed, 32 insertions, 14 deletions
diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties
index f2ca8940..1d47f55b 100644
--- a/.github/ci-gradle.properties
+++ b/.github/ci-gradle.properties
@@ -3,4 +3,16 @@
# SPDX-License-Identifier: GPL-3.0-only
#
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Add opens for KAPT
+# https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-4862682.0-0
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \
+ --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
diff --git a/.github/workflows/dependency_sync.yml b/.github/workflows/dependency_sync.yml
index ee6500de..30bf8a19 100644
--- a/.github/workflows/dependency_sync.yml
+++ b/.github/workflows/dependency_sync.yml
@@ -36,7 +36,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- uses: gradle/gradle-build-action@v2.0.1
diff --git a/.github/workflows/deploy_github_releases.yml b/.github/workflows/deploy_github_releases.yml
index df631c12..2feb654e 100644
--- a/.github/workflows/deploy_github_releases.yml
+++ b/.github/workflows/deploy_github_releases.yml
@@ -16,7 +16,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Decrypt secrets
diff --git a/.github/workflows/deploy_library_releases.yml b/.github/workflows/deploy_library_releases.yml
index 477a9079..052bde99 100644
--- a/.github/workflows/deploy_library_releases.yml
+++ b/.github/workflows/deploy_library_releases.yml
@@ -16,7 +16,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Determine publishing task
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 2542b75e..7183f427 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -16,7 +16,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Decrypt secrets
diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml
index 21454225..ee04aa2c 100644
--- a/.github/workflows/draft_new_release.yml
+++ b/.github/workflows/draft_new_release.yml
@@ -39,7 +39,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Update changelog
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b09c8b6f..fd216614 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -29,7 +29,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
@@ -64,7 +64,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
@@ -106,7 +106,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
@@ -141,7 +141,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
@@ -176,7 +176,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
@@ -211,7 +211,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Copy CI gradle.properties
diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml
index e6d6aed9..9d5235ab 100644
--- a/.github/workflows/sync_crowdin.yml
+++ b/.github/workflows/sync_crowdin.yml
@@ -14,7 +14,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Download new translations from Crowdin
diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml
index 1fcb40e8..b6f81d99 100644
--- a/.github/workflows/update_publicsuffix_data.yml
+++ b/.github/workflows/update_publicsuffix_data.yml
@@ -15,7 +15,7 @@ jobs:
uses : actions/setup-java@v2.4.0
with :
distribution : 'zulu'
- java-version : '11'
+ java-version : '17'
cache: 'gradle'
- name: Download new publicsuffix data
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
index 71a68d9c..7ef59be9 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
@@ -4,6 +4,7 @@
*/
import org.gradle.api.JavaVersion
+import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.kotlin.dsl.withType
@@ -11,6 +12,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
val additionalCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
+tasks.withType<JavaCompile>().configureEach {
+ sourceCompatibility = JavaVersion.VERSION_11.toString()
+ targetCompatibility = JavaVersion.VERSION_11.toString()
+}
+
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
allWarningsAsErrors = true
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 13:23:15 +0000