Update Gradle and build dependencies (#4808)

* Update Gradle and build dependencies

* Add spotless + Java 17 workaround

* Revert spotless for now

* Fix merge

* jvmTarget

conventions/build.gradle.kts

@@ -38,23 +38,24 @@ dependencies {
 
  // When updating, update above in plugins too
  implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
- implementation("com.google.guava:guava:30.1-jre")
+ implementation("com.google.guava:guava:31.0.1-jre")
  implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
- implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+ implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
  implementation("org.ow2.asm:asm:9.1")
  implementation("org.ow2.asm:asm-tree:9.1")
  implementation("org.apache.httpcomponents:httpclient:4.5.13")
- implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
- implementation("ru.vyarus:gradle-animalsniffer-plugin:1.5.3")
+ implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
+ implementation("ru.vyarus:gradle-animalsniffer-plugin:1.5.4")
  // When updating, also update dependencyManagement/build.gradle.kts
  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.22")
  implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
- implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.5")
- implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.1")
- implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.1.0")
+ implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.6")
+ implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.2")
+ implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.2.0")
  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.3.0")
 
- testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
- testImplementation("org.assertj:assertj-core:3.19.0")
+ testImplementation(enforcedPlatform("org.junit:junit-bom:5.8.2"))
+ testImplementation("org.junit.jupiter:junit-jupiter-api")
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+ testImplementation("org.assertj:assertj-core:3.21.0")
 }

gradle-plugins/build.gradle.kts

@@ -23,7 +23,7 @@ configurations.named("compileOnly") {
 }
 
 dependencies {
- implementation("com.google.guava:guava:30.1.1-jre")
+ implementation("com.google.guava:guava:31.0.1-jre")
  // we need to use byte buddy variant that does not shade asm
  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.22") {
  exclude(group = "net.bytebuddy", module = "byte-buddy")
@@ -34,11 +34,11 @@ dependencies {
  implementation("org.eclipse.aether:aether-transport-http:1.1.0")
  implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
- implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+ implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
 
- testImplementation("org.assertj:assertj-core:3.19.0")
+ testImplementation("org.assertj:assertj-core:3.21.0")
 
- testImplementation(enforcedPlatform("org.junit:junit-bom:5.7.2"))
+ testImplementation(enforcedPlatform("org.junit:junit-bom:5.8.2"))
  testImplementation("org.junit.jupiter:junit-jupiter-api")
  testImplementation("org.junit.jupiter:junit-jupiter-params")
  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")

gradle.properties

@@ -4,7 +4,18 @@ org.gradle.caching=true
 org.gradle.priority=low
 
 # Gradle default is 256m which causes issues with our build - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+# Also workaround https://github.com/diffplug/spotless/issues/834
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \
+ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+ --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+ --add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
+ --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+ --add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+ --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+ --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
 
  org.gradle.warning.mode=fail
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

instrumentation/kotlinx-coroutines/javaagent/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
  id("org.jetbrains.kotlin.jvm")
  id("otel.javaagent-instrumentation")
@@ -27,6 +29,12 @@ dependencies {
 }
 
 tasks {
+ withType(KotlinCompile::class).configureEach {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+ }
+
  val compileTestKotlin by existing(AbstractCompile::class)
 
  named<GroovyCompile>("compileTestGroovy") {

settings.gradle.kts

@@ -1,15 +1,12 @@
 pluginManagement {
  plugins {
  id("com.github.ben-manes.versions") version "0.39.0"
- id("com.github.jk1.dependency-license-report") version "1.16"
- id("com.gradle.plugin-publish") version "0.15.0"
+ id("com.github.jk1.dependency-license-report") version "2.0"
+ id("com.gradle.plugin-publish") version "0.18.0"
  id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
- id("me.champeau.jmh") version "0.6.5"
- id("org.jetbrains.kotlin.jvm") version "1.5.10"
+ id("org.jetbrains.kotlin.jvm") version "1.6.0"
  id("org.unbroken-dome.test-sets") version "4.0.0"
  id("org.xbib.gradle.plugin.jflex") version "1.5.0"
- id("com.github.johnrengelman.shadow") version "7.0.0"
- id("ru.vyarus.animalsniffer") version "1.5.3"
  }
 }