diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index a0972cbfd3..0000000000 --- a/.github/renovate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "semanticCommits": "disabled" -} diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 0000000000..5fd1a7750e --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,26 @@ +{ + $schema: 'https://docs.renovatebot.com/renovate-schema.json', + extends: [ + 'config:recommended', + ], + ignorePresets: [ + // Ensure we get the latest version and are not pinned to old versions. + 'workarounds:javaLTSVersions', + ], + customManagers: [ + // Update .java-version file with the latest JDK version. + { + customType: 'regex', + fileMatch: [ + '\\.java-version$', + ], + matchStrings: [ + '(?.*)\\n', + ], + datasourceTemplate: 'java-version', + depNameTemplate: 'java', + // Only write the major version. + extractVersionTemplate: '^(?\\d+)', + }, + ] +} diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version new file mode 100644 index 0000000000..d6b24041cf --- /dev/null +++ b/.github/workflows/.java-version @@ -0,0 +1 @@ +19 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c218b6ee5f..174a57fafa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - 8 - 11 - 17 - - 19 + - latest steps: - name: Checkout @@ -32,11 +32,10 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 - - name: Configure JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - name: Test run: | @@ -56,7 +55,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - uses: gradle/actions/setup-gradle@v4 @@ -78,11 +77,10 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 - - name: Configure JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - name: Test run: | @@ -103,11 +101,10 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 - - name: Configure JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - name: Test if: matrix.os != 'windows-latest' @@ -135,11 +132,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Configure JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - name: Upload Artifacts run: | @@ -161,11 +157,10 @@ jobs: with: fetch-depth: 0 - - name: Configure JDK - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ae2c5adf80..2d1f0ffa8e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 19 + java-version-file: .github/workflows/.java-version - run: ./gradlew publish env: diff --git a/build.gradle.kts b/build.gradle.kts index 7e890ecc7a..c2f98c8004 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -192,12 +192,14 @@ subprojects { targetCompatibility = JavaVersion.VERSION_1_8.toString() } - val testJavaVersion = System.getProperty("test.java.version", "19").toInt() + val testJavaVersion = System.getProperty("test.java.version", "").toIntOrNull() tasks.withType { val javaToolchains = project.extensions.getByType() - javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(testJavaVersion)) - }) + if (testJavaVersion != null) { + javaLauncher.set(javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(testJavaVersion)) + }) + } testLogging { events(STARTED, PASSED, SKIPPED, FAILED)