Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly target java 17 for the plugins #56

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions buildlogic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ plugins {
alias(libs.plugins.kotlin.jvm)
}

kotlin {
jvmToolchain {
jvmToolchain(17)
}
}

gradlePlugin {
plugins {
create("bundlePlugin") {
Expand Down
6 changes: 6 additions & 0 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ dependencies {
implementation(libs.okhttp)
}

kotlin {
jvmToolchain {
jvmToolchain(17)
}
}

testing {
suites {
// Configure the built-in test suite
Expand Down
4 changes: 2 additions & 2 deletions gcpbuildcache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion gcpbuildcache/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -53,7 +59,7 @@ gradlePlugin {
}

group = "androidx.build.gradle.gcpbuildcache"
version = "1.0.0-beta08"
version = "1.0.0-beta09"

testing {
suites {
Expand Down
4 changes: 2 additions & 2 deletions s3buildcache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion s3buildcache/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -65,7 +71,7 @@ gradlePlugin {
}

group = "androidx.build.gradle.s3buildcache"
version = "1.0.0-alpha05"
version = "1.0.0-alpha06"

testing {
suites {
Expand Down
Loading