Merge pull request #56 from androidx/target17

Explicitly target java 17 for the plugins
androidx · May 24, 2024 · 33a47a5 · 33a47a5
2 parents 4a81907 + 4f95042
commit 33a47a5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {