Skip to content

Commit 33a47a5

Browse files
authored
Merge pull request #56 from androidx/target17
Explicitly target java 17 for the plugins
2 parents 4a81907 + 4f95042 commit 33a47a5

File tree

6 files changed

+30
-6
lines changed

6 files changed

+30
-6
lines changed

buildlogic/build.gradle.kts

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ plugins {
2020
alias(libs.plugins.kotlin.jvm)
2121
}
2222

23+
kotlin {
24+
jvmToolchain {
25+
jvmToolchain(17)
26+
}
27+
}
28+
2329
gradlePlugin {
2430
plugins {
2531
create("bundlePlugin") {

core/build.gradle.kts

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ dependencies {
3030
implementation(libs.okhttp)
3131
}
3232

33+
kotlin {
34+
jvmToolchain {
35+
jvmToolchain(17)
36+
}
37+
}
38+
3339
testing {
3440
suites {
3541
// Configure the built-in test suite

gcpbuildcache/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.build.gradle.gcpbuildcache.GcpBuildCacheServiceFactory
1212
import androidx.build.gradle.gcpbuildcache.ExportedKeyGcpCredentials
1313

1414
plugins {
15-
id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta07"
15+
id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta09"
1616
}
1717

1818
buildCache {
@@ -35,7 +35,7 @@ If you are using Groovy, then you should do the following:
3535

3636
```groovy
3737
plugins {
38-
id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta07"
38+
id("androidx.build.gradle.gcpbuildcache") version "1.0.0-beta09"
3939
}
4040
4141
import androidx.build.gradle.gcpbuildcache.GcpBuildCache

gcpbuildcache/build.gradle.kts

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ dependencies {
3535
implementation(libs.okhttp)
3636
}
3737

38+
kotlin {
39+
jvmToolchain {
40+
jvmToolchain(17)
41+
}
42+
}
43+
3844
gradlePlugin {
3945
website = "https://github.com/androidx/gcp-gradle-build-cache"
4046
vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
@@ -53,7 +59,7 @@ gradlePlugin {
5359
}
5460

5561
group = "androidx.build.gradle.gcpbuildcache"
56-
version = "1.0.0-beta08"
62+
version = "1.0.0-beta09"
5763

5864
testing {
5965
suites {

s3buildcache/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In your `settings.gradle(.kts)` file add the following
88

99
```kotlin
1010
plugins {
11-
id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha05"
11+
id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha06"
1212
}
1313

1414
import androidx.build.gradle.s3buildcache.S3BuildCache
@@ -36,7 +36,7 @@ If you are using Groovy, then you should do the following:
3636

3737
```groovy
3838
plugins {
39-
id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha05"
39+
id("androidx.build.gradle.s3buildcache") version "1.0.0-alpha06"
4040
}
4141
4242
import androidx.build.gradle.s3buildcache.ExportedS3Credentials

s3buildcache/build.gradle.kts

+7-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ dependencies {
4343
}
4444
}
4545

46+
kotlin {
47+
jvmToolchain {
48+
jvmToolchain(17)
49+
}
50+
}
51+
4652
gradlePlugin {
4753
website = "https://github.com/androidx/gcp-gradle-build-cache"
4854
vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
@@ -65,7 +71,7 @@ gradlePlugin {
6571
}
6672

6773
group = "androidx.build.gradle.s3buildcache"
68-
version = "1.0.0-alpha05"
74+
version = "1.0.0-alpha06"
6975

7076
testing {
7177
suites {

0 commit comments

Comments
 (0)