fix(build): use JVM toolchains

android-password-store · Jun 29, 2023 · dfedb0d · dfedb0d
1 parent 7d61530
commit dfedb0d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -99,6 +99,8 @@ kotlin {
       }
     }
   }
+
+  jvmToolchain { languageVersion.set(JavaLanguageVersion.of(11)) }
 }
 
 tasks.withType<Test>().configureEach {

diff --git 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)