From 4f95042bc8d01d17b2fa2dbb405d1349c01269f1 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Fri, 24 May 2024 18:11:11 +0000
Subject: [PATCH] Explicitly target java 17 for the plugins

Test: ./gradlew publishToMavenLocal
---
 buildlogic/build.gradle.kts    | 6 ++++++
 core/build.gradle.kts          | 6 ++++++
 gcpbuildcache/README.md        | 4 ++--
 gcpbuildcache/build.gradle.kts | 8 +++++++-
 s3buildcache/README.md         | 4 ++--
 s3buildcache/build.gradle.kts  | 8 +++++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/buildlogic/build.gradle.kts b/buildlogic/build.gradle.kts
index 7a7e1ab..3de2c1a 100644
--- a/buildlogic/build.gradle.kts
+++ b/buildlogic/build.gradle.kts
@@ -20,6 +20,12 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
 }
 
+kotlin {
+    jvmToolchain {
+        jvmToolchain(17)
+    }
+}
+
 gradlePlugin {
     plugins {
         create("bundlePlugin") {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 2de1e77..ee402ec 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -30,6 +30,12 @@ dependencies {
     implementation(libs.okhttp)
 }
 
+kotlin {
+    jvmToolchain {
+        jvmToolchain(17)
+    }
+}
+
 testing {
     suites {
         // Configure the built-in test suite
diff --git a/gcpbuildcache/README.md b/gcpbuildcache/README.md
index 259c6b4..6662685 100644
--- a/gcpbuildcache/README.md
+++ b/gcpbuildcache/README.md
@@ -12,7 +12,7 @@ import androidx.build.gradle.gcpbuildcache.GcpBuildCacheServiceFactory
 import androidx.build.gradle.gcpbuildcache.ExportedKeyGcpCredentials
 
 plugins {
-    id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta07"
+    id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta09"
 }
 
 buildCache {
@@ -35,7 +35,7 @@ If you are using Groovy, then you should do the following:
 
 ```groovy
 plugins {
-    id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta07"
+    id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta09"
 }
 
 import androidx.build.gradle.gcpbuildcache.GcpBuildCache
diff --git a/gcpbuildcache/build.gradle.kts b/gcpbuildcache/build.gradle.kts
index 408dae9..5099ef3 100644
--- a/gcpbuildcache/build.gradle.kts
+++ b/gcpbuildcache/build.gradle.kts
@@ -35,6 +35,12 @@ dependencies {
     implementation(libs.okhttp)
 }
 
+kotlin {
+    jvmToolchain {
+        jvmToolchain(17)
+    }
+}
+
 gradlePlugin {
     website = "https://github.com/androidx/gcp-gradle-build-cache"
     vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
@@ -53,7 +59,7 @@ gradlePlugin {
 }
 
 group = "androidx.build.gradle.gcpbuildcache"
-version = "1.0.0-beta08"
+version = "1.0.0-beta09"
 
 testing {
     suites {
diff --git a/s3buildcache/README.md b/s3buildcache/README.md
index a0963df..6f4d9f5 100644
--- a/s3buildcache/README.md
+++ b/s3buildcache/README.md
@@ -8,7 +8,7 @@ In your `settings.gradle(.kts)` file add the following
 
 ```kotlin
 plugins {
-  id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha05"
+  id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha06"
 }
 
 import androidx.build.gradle.s3buildcache.S3BuildCache
@@ -36,7 +36,7 @@ If you are using Groovy, then you should do the following:
 
 ```groovy
 plugins {
-  id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha05"
+  id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha06"
 }
 
 import androidx.build.gradle.s3buildcache.ExportedS3Credentials
diff --git a/s3buildcache/build.gradle.kts b/s3buildcache/build.gradle.kts
index 240cbf5..bfe016c 100644
--- a/s3buildcache/build.gradle.kts
+++ b/s3buildcache/build.gradle.kts
@@ -43,6 +43,12 @@ dependencies {
     }
 }
 
+kotlin {
+    jvmToolchain {
+        jvmToolchain(17)
+    }
+}
+
 gradlePlugin {
     website = "https://github.com/androidx/gcp-gradle-build-cache"
     vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
@@ -65,7 +71,7 @@ gradlePlugin {
 }
 
 group = "androidx.build.gradle.s3buildcache"
-version = "1.0.0-alpha05"
+version = "1.0.0-alpha06"
 
 testing {
     suites {