Merge pull request #31 from androidx/gradleupgrade

Upgrade to Gradle 8.2
androidx · Jul 6, 2023 · 492cfdd · 492cfdd
2 parents 01f508c + 5bd6e0b
commit 492cfdd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 27 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -29,8 +29,7 @@ testing {
  suites {
  // Configure the built-in test suite
  val test by getting(JvmTestSuite::class) {
- // Use Kotlin Test Framework
- useKotlinTest()
+ useJUnit()
  }
  }
 }
diff --git a/gcpbuildcache/build.gradle.kts b/gcpbuildcache/build.gradle.kts
@@ -27,13 +27,9 @@ dependencies {
  implementation(libs.google.cloud.storage)
 }
 
-pluginBundle {
- website = "https://github.com/androidx/gcp-gradle-build-cache"
- vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
- tags = listOf("buildcache", "gcp", "caching")
-}
-
 gradlePlugin {
+ website.set("https://github.com/androidx/gcp-gradle-build-cache")
+ vcsUrl.set("https://github.com/androidx/gcp-gradle-build-cache")
  plugins {
  create("gcpbuildcache") {
  id = "androidx.build.gradle.gcpbuildcache"
@@ -42,6 +38,7 @@ gradlePlugin {
  - Warn when a user incorrectly configures GCP bucket to be used for the cache.
  """.trimIndent()
  implementationClass = "androidx.build.gradle.gcpbuildcache.GcpGradleBuildCachePlugin"
+ tags.set(listOf("buildcache", "gcp", "caching"))
  }
  }
 }
@@ -53,18 +50,16 @@ testing {
  suites {
  // Configure the built-in test suite
  val test by getting(JvmTestSuite::class) {
- // Use Kotlin Test Framework
- useKotlinTest()
+ useJUnit()
  }
 
  // Create a new test suite
  val functionalTest by registering(JvmTestSuite::class) {
- // Use Kotlin Test Framework
- useKotlinTest()
+ useJUnit()
 
  dependencies {
  // functionalTest test suite depends on the production code in tests
- implementation(project)
+ implementation(project())
  }
 
  targets {

diff --git a/...est/kotlin/androidx/build/gradle/gcpbuildcache/GcpGradleBuildCachePluginFunctionalTest.kt b/...est/kotlin/androidx/build/gradle/gcpbuildcache/GcpGradleBuildCachePluginFunctionalTest.kt
@@ -22,8 +22,8 @@ package androidx.build.gradle.gcpbuildcache
 
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
+import org.junit.Test
 import org.junit.rules.TemporaryFolder
-import kotlin.test.Test
 
 /**
  * A simple functional test for the 'androidx.build.gradle.gcpbuildcache.GcpBuildCache' plugin.

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -166,7 +166,11 @@
  <trusted-key id="feb9209f2f2f3f4664841e55ac107b386692dadd" group="^software[.]amazon($|([.].*))" regex="true"/>
  <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
  <trusting group="junit"/>
+ <trusting group="org.apiguardian"/>
  <trusting group="org.junit"/>
+ <trusting group="org.junit.jupiter"/>
+ <trusting group="org.junit.platform"/>
+ <trusting group="org.opentest4j"/>
  </trusted-key>
  <trusted-key id="ffa95b1dd22fe6d191189afa718e28a09e67016b" group="jakarta.websocket"/>
  </trusted-keys>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/s3buildcache/build.gradle.kts b/s3buildcache/build.gradle.kts
@@ -36,19 +36,16 @@ dependencies {
  }
 }
 
-pluginBundle {
- website = "https://github.com/androidx/gcp-gradle-build-cache"
- vcsUrl = "https://github.com/androidx/gcp-gradle-build-cache"
- tags = listOf("buildcache", "s3", "caching")
-}
-
 gradlePlugin {
+ website.set("https://github.com/androidx/gcp-gradle-build-cache")
+ vcsUrl.set("https://github.com/androidx/gcp-gradle-build-cache")
  plugins {
  create("s3buildcache") {
  id = "androidx.build.gradle.s3buildcache"
  displayName = "Gradle AWS S3 Build Cache Plugin"
  description = "Gradle remote build cache backed by AWS S3"
  implementationClass = "androidx.build.gradle.s3buildcache.S3GradleBuildCachePlugin"
+ tags.set(listOf("buildcache", "s3", "caching"))
  }
  }
 }
@@ -60,18 +57,16 @@ testing {
  suites {
  // Configure the built-in test suite
  val test by getting(JvmTestSuite::class) {
- // Use Kotlin Test Framework
- useKotlinTest()
+ useJUnit()
  }
 
  // Create a new test suite
  val functionalTest by registering(JvmTestSuite::class) {
- // Use Kotlin Test Framework
- useKotlinTest()
+ useJUnit()
 
  dependencies {
  // functionalTest test suite depends on the production code in tests
- implementation(project)
+ implementation(project())
  }
 
  targets {

diff --git a/...lTest/kotlin/androidx/build/gradle/s3buildcache/S3GradleBuildCachePluginFunctionalTest.kt b/...lTest/kotlin/androidx/build/gradle/s3buildcache/S3GradleBuildCachePluginFunctionalTest.kt
@@ -19,8 +19,8 @@ package androidx.build.gradle.s3buildcache
 
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
+import org.junit.Test
 import org.junit.rules.TemporaryFolder
-import kotlin.test.Test
 
 /**
  * A simple functional test for the 'androidx.build.gradle.s3buildcache.S3BuildCache' plugin.