aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/codeql_analysis.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.yml10
-rw-r--r--.github/workflows/shadow_job.yml2
-rw-r--r--.github/workflows/sync_crowdin.yml2
-rw-r--r--.github/workflows/update_publicsuffix_data.yml2
-rw-r--r--build-logic/build.gradle.kts5
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt2
11 files changed, 15 insertions, 18 deletions
diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml
index 2f644f5c..4bba3c86 100644
--- a/.github/workflows/codeql_analysis.yml
+++ b/.github/workflows/codeql_analysis.yml
@@ -28,7 +28,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Initialize CodeQL
uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
diff --git a/.github/workflows/deploy_github_releases.yml b/.github/workflows/deploy_github_releases.yml
index c6a497e6..d891307c 100644
--- a/.github/workflows/deploy_github_releases.yml
+++ b/.github/workflows/deploy_github_releases.yml
@@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Decrypt secrets
run: scripts/signing-setup.sh "$ENCRYPT_KEY"
diff --git a/.github/workflows/deploy_library_releases.yml b/.github/workflows/deploy_library_releases.yml
index 9f934241..01522c93 100644
--- a/.github/workflows/deploy_library_releases.yml
+++ b/.github/workflows/deploy_library_releases.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Upload binaries
uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # v2.7.1
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 0802a78c..dd7f32e4 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -27,7 +27,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Decrypt secrets
run: scripts/signing-setup.sh "$ENCRYPT_KEY"
diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml
index ae70d4a3..814ca948 100644
--- a/.github/workflows/draft_new_release.yml
+++ b/.github/workflows/draft_new_release.yml
@@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Update changelog
uses: thomaseizinger/keep-a-changelog-new-release@5bc232893483441c5d6cd6c9dcb1e48abf9a2bae # 1.3.0
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index c5fdbce6..85ec25bd 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -45,7 +45,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -76,7 +76,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -114,7 +114,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -145,7 +145,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -176,7 +176,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
diff --git a/.github/workflows/shadow_job.yml b/.github/workflows/shadow_job.yml
index 6fc3dc97..087b2e0e 100644
--- a/.github/workflows/shadow_job.yml
+++ b/.github/workflows/shadow_job.yml
@@ -29,7 +29,7 @@ jobs:
- release-nightly
- nightly
java-version:
- - 18
+ - 20
runs-on: ubuntu-latest
name: Run Gradle-${{ matrix.gradle-version }}, AGP-${{ matrix.agp-version }}, Java-${{ matrix.java-version }}
steps:
diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml
index 8aa017ad..2cb0897c 100644
--- a/.github/workflows/sync_crowdin.yml
+++ b/.github/workflows/sync_crowdin.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Download new translations from Crowdin
uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # v2.7.1
diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml
index 1401347b..b0b711b3 100644
--- a/.github/workflows/update_publicsuffix_data.yml
+++ b/.github/workflows/update_publicsuffix_data.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
distribution: temurin
- java-version: 18
+ java-version: 20
- name: Download new publicsuffix data
uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # v2.7.1
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 19fb1043..b5e2ed8f 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -5,10 +5,7 @@
plugins { `kotlin-dsl` }
-private val jvmToolchainAction =
- Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
-
-kotlin.jvmToolchain(jvmToolchainAction)
+kotlin.jvmToolchain(20)
gradlePlugin {
plugins {
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
index 68195033..14b8e716 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
@@ -47,6 +47,6 @@ class KotlinCommonPlugin : Plugin<Project> {
)
val JVM_TOOLCHAIN_ACTION =
- Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
+ Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(20)) }
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-21 22:41:47 +0000