From dfedb0d399a7be8f96ec905660a7b9b215a797fd Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 30 Jun 2023 01:54:36 +0530 Subject: [PATCH] fix(build): use JVM toolchains --- .github/workflows/benchmark.yml | 3 +-- .github/workflows/check.yml | 3 +-- .github/workflows/release.yml | 6 ++---- benchmark/build.gradle.kts | 2 ++ build.gradle.kts | 2 ++ settings.gradle.kts | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 171f56b..b09b13d 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -19,8 +19,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: temurin - java-version: 18 - cache: gradle + java-version: 11 - name: Cache Kotlin/Native compiler uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9d7f604..3dd08fd 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -25,8 +25,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: temurin - java-version: 18 - cache: gradle + java-version: 11 - name: Cache Kotlin/Native compiler uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b46f21..8c13ec4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,8 +30,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: temurin - java-version: 18 - cache: gradle + java-version: 11 - name: Cache Kotlin/Native compiler uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 @@ -61,8 +60,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: temurin - java-version: 18 - cache: gradle + java-version: 11 - name: Cache Kotlin/Native compiler uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index cc3c100..b8b1f85 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -36,4 +36,6 @@ kotlin { implementation(project(":")) implementation(libs.kotlinx.benchmark.runtime) } + + jvmToolchain { languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/build.gradle.kts b/build.gradle.kts index f97997b..108d016 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -99,6 +99,8 @@ kotlin { } } } + + jvmToolchain { languageVersion.set(JavaLanguageVersion.of(11)) } } tasks.withType().configureEach { diff --git a/settings.gradle.kts b/settings.gradle.kts index a1c428f..d55084b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,7 @@ rootProject.name = "sublime-fuzzy" pluginManagement { + plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } repositories { exclusiveContent { forRepository(::gradlePluginPortal)