From de368ecd6854b152bfef09cf68c6c9521ddd061c Mon Sep 17 00:00:00 2001 From: Gabriel Feo Date: Thu, 25 May 2023 15:31:02 +0100 Subject: [PATCH 1/3] Configure toolchain auto-provisioning --- library/build.gradle.kts | 1 + settings.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/library/build.gradle.kts b/library/build.gradle.kts index d1fd5320c..f0591924b 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -139,6 +139,7 @@ java { withJavadocJar() toolchain { languageVersion.set(JavaLanguageVersion.of(8)) + vendor.set(JvmVendorSpec.AZUL) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2b1cc3f1e..fd448217c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,6 @@ plugins { id("com.gradle.enterprise") version("3.13.2") + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") } include( From 24d66372aa9c145c03dba5d4a7e41da5740264dd Mon Sep 17 00:00:00 2001 From: Gabriel Feo Date: Thu, 25 May 2023 15:39:22 +0100 Subject: [PATCH 2/3] Use Zulu 20 for Gradle --- .github/actions/build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index bd0c37c9b..a8843c3d3 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -20,8 +20,8 @@ runs: - name: Set up Java uses: actions/setup-java@v2 with: - distribution: temurin - java-version: 8 + distribution: zulu + java-version: 20 - name: Validate Gradle wrapper JAR uses: gradle/wrapper-validation-action@v1.0.6 - name: Set up Gradle From 0e9ed0c3d79b2841cb914154c8396a4834e11c90 Mon Sep 17 00:00:00 2001 From: Gabriel Feo Date: Thu, 25 May 2023 15:43:57 +0100 Subject: [PATCH 3/3] Set up toolchains for example project (cherry picked from commit 8a5990029b832752926ae9e2744b6aa0aa56bd0b) --- examples/example-project/app/build.gradle.kts | 6 ++++++ examples/example-project/settings.gradle.kts | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/examples/example-project/app/build.gradle.kts b/examples/example-project/app/build.gradle.kts index b8566c339..b243c48a9 100644 --- a/examples/example-project/app/build.gradle.kts +++ b/examples/example-project/app/build.gradle.kts @@ -12,6 +12,12 @@ repositories { maven(url = "https://jitpack.io") } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { implementation("com.github.gabrielfeo:gradle-enterprise-api-kotlin:0.16.0") } diff --git a/examples/example-project/settings.gradle.kts b/examples/example-project/settings.gradle.kts index 676939f7a..57a2ce80c 100644 --- a/examples/example-project/settings.gradle.kts +++ b/examples/example-project/settings.gradle.kts @@ -1,9 +1,13 @@ rootProject.name = "example-project" -include(":app") +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} dependencyResolutionManagement { repositories { mavenCentral() } } + +include(":app")