Gradle 7.2 for appengine-plugins core

gistfile1.txt

suztomo@suztomo2:~/git-on-borg/appengine-plugins/app-gradle-plugin$ git diff
diff --git a/app-gradle-plugin/build.gradle.kts b/app-gradle-plugin/build.gradle.kts
index e6278e03..e169af73 100644
--- a/app-gradle-plugin/build.gradle.kts
+++ b/app-gradle-plugin/build.gradle.kts
@@ -24,7 +24,6 @@ version = "2.8.1" // {x-version-update:app-gradle-plugin:current}
 
 plugins {
   id("java")
-  id("maven")
   id("java-gradle-plugin")
   id("net.researchgate.release") version "2.6.0"
   id("com.github.sherter.google-java-format") version "0.9"
@@ -33,7 +32,7 @@ plugins {
   id("maven-publish")
   id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
   id("signing")
-  id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.0"
+  id("com.google.cloud.artifactregistry.gradle-plugin") version "2.2.3"
 }
 
 repositories {
@@ -82,18 +81,6 @@ tasks.withType<JavaCompile>().configureEach {
     )
 }
 
-// Gradle 6 needs a special treatment for Guava 31+; otherwise you get "... However we
-// cannot choose between the following variants..." error.
-// https://github.com/google/guava/releases/tag/v32.1.0
-sourceSets.all {
-  configurations.getByName(runtimeClasspathConfigurationName) {
-    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String::class.java), "standard-jvm")
-  }
-  configurations.getByName(compileClasspathConfigurationName) {
-    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String::class.java), "standard-jvm")
-  }
-}
-
 /* TESTING */
 tasks.test.configure {
   testLogging {
@@ -109,11 +96,6 @@ sourceSets {
   }
 }
 
-configurations {
-  named("integTestCompile").get().extendsFrom(testCompileClasspath.get())
-  named("integTestRuntime").get().extendsFrom(testRuntimeClasspath.get())
-}
-
 tasks.register<Test>("integTest") {
   testClassesDirs = sourceSets.getByName("integTest").output.classesDirs
   classpath = sourceSets.getByName("integTest").runtimeClasspath
diff --git a/app-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/app-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index 549d8442..ffed3a25 100644
--- a/app-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/app-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists