From 8685c273c95711b85c27aaf9f98a2d8c79995278 Mon Sep 17 00:00:00 2001 From: StefMa Date: Thu, 7 Mar 2024 08:03:47 +0000 Subject: [PATCH 1/2] Use JVM Toolchain --- .github/workflows/callable.build.yml | 4 ---- .../callable.code-analysis.codeql.yml | 4 ---- .../callable.code-analysis.trivy.yml | 4 ---- .github/workflows/callable.gradle-release.yml | 4 ---- .../workflows/callable.integration-test.yml | 4 ---- .../workflows/callable.publish-javadoc.yml | 4 ---- .../workflows/callable.publish-sonatype.yml | 4 ---- java-library-template/build.gradle.kts | 22 ++++++++++++------- settings.gradle.kts | 4 ++++ 9 files changed, 18 insertions(+), 36 deletions(-) diff --git a/.github/workflows/callable.build.yml b/.github/workflows/callable.build.yml index 9f043e6..f687c88 100644 --- a/.github/workflows/callable.build.yml +++ b/.github/workflows/callable.build.yml @@ -11,10 +11,6 @@ jobs: - name: Checkout project sources uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.code-analysis.codeql.yml b/.github/workflows/callable.code-analysis.codeql.yml index 13b8913..2cca2b7 100644 --- a/.github/workflows/callable.code-analysis.codeql.yml +++ b/.github/workflows/callable.code-analysis.codeql.yml @@ -35,10 +35,6 @@ jobs: # queries: security-extended,security-and-quality queries: security-extended,security-and-quality - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.code-analysis.trivy.yml b/.github/workflows/callable.code-analysis.trivy.yml index c37afe6..ccac486 100644 --- a/.github/workflows/callable.code-analysis.trivy.yml +++ b/.github/workflows/callable.code-analysis.trivy.yml @@ -17,10 +17,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.gradle-release.yml b/.github/workflows/callable.gradle-release.yml index 5a9fb6b..42d9d59 100644 --- a/.github/workflows/callable.gradle-release.yml +++ b/.github/workflows/callable.gradle-release.yml @@ -27,10 +27,6 @@ jobs: with: ref: main token: ${{ secrets.CI_GITHUB_TOKEN }} - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.integration-test.yml b/.github/workflows/callable.integration-test.yml index f11fd13..58e988c 100644 --- a/.github/workflows/callable.integration-test.yml +++ b/.github/workflows/callable.integration-test.yml @@ -11,10 +11,6 @@ jobs: - name: Checkout project sources uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.publish-javadoc.yml b/.github/workflows/callable.publish-javadoc.yml index 89ec474..d0c409e 100644 --- a/.github/workflows/callable.publish-javadoc.yml +++ b/.github/workflows/callable.publish-javadoc.yml @@ -14,10 +14,6 @@ jobs: - name: Checkout project sources uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/.github/workflows/callable.publish-sonatype.yml b/.github/workflows/callable.publish-sonatype.yml index d118a3d..521c6c2 100644 --- a/.github/workflows/callable.publish-sonatype.yml +++ b/.github/workflows/callable.publish-sonatype.yml @@ -10,10 +10,6 @@ jobs: - name: Checkout project sources uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'corretto' - java-version: '21' - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3.1.0 diff --git a/java-library-template/build.gradle.kts b/java-library-template/build.gradle.kts index 9f96f54..f46e559 100644 --- a/java-library-template/build.gradle.kts +++ b/java-library-template/build.gradle.kts @@ -1,3 +1,13 @@ +import org.gradle.jvm.toolchain.JavaLanguageVersion +import org.gradle.jvm.toolchain.JvmVendorSpec + +plugins { + // Apply the java-library plugin for API and implementation separation. + `java-library` + `maven-publish` + signing +} + group = "dev.thriving.oss" object Meta { @@ -14,14 +24,10 @@ object Meta { } java { - sourceCompatibility = JavaVersion.VERSION_21 -} - -plugins { - // Apply the java-library plugin for API and implementation separation. - `java-library` - `maven-publish` - signing + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + vendor.set(JvmVendorSpec.AMAZON) + } } repositories { diff --git a/settings.gradle.kts b/settings.gradle.kts index f105b4f..7490edb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + rootProject.name = "java-library-template" include("java-library-template") From 43825452b9f2b9be60fffa1863fb8e68b25d4f8f Mon Sep 17 00:00:00 2001 From: Stefan M Date: Sun, 9 Jun 2024 19:56:04 +0200 Subject: [PATCH 2/2] Use assign syntax for Gradle properties Co-authored-by: Hartmut --- java-library-template/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-library-template/build.gradle.kts b/java-library-template/build.gradle.kts index f46e559..c816d1b 100644 --- a/java-library-template/build.gradle.kts +++ b/java-library-template/build.gradle.kts @@ -25,8 +25,8 @@ object Meta { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - vendor.set(JvmVendorSpec.AMAZON) + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.AMAZON } }