Update Gradle and build dependencies. (open-telemetry#4167)

anuraaga · web-flow · commit 34273f43ca09 · 2022-02-10T16:54:49.000-06:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
   `kotlin-dsl`
 
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.0.5"
+  id("com.diffplug.spotless") version "6.2.2"
 }
 
 repositories {
@@ -12,18 +12,18 @@ repositories {
 }
 
 dependencies {
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.5")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.2.2")
   // Needed for japicmp but not automatically brought in for some reason.
   implementation("com.google.guava:guava:31.0.1-jre")
   implementation("com.squareup:javapoet:1.13.0")
-  implementation("com.squareup.wire:wire-compiler:4.0.1")
-  implementation("com.squareup.wire:wire-gradle-plugin:4.0.1")
+  implementation("com.squareup.wire:wire-compiler:4.1.0")
+  implementation("com.squareup.wire:wire-gradle-plugin:4.1.0")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.3.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("net.ltgt.gradle:gradle-nullaway-plugin:1.3.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.5.4")
 }
 
diff --git a/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt
@@ -66,7 +66,6 @@ class ProtoFieldsWireHandler : CustomHandlerBeta {
           javaFile.packageName.replace(".", "/") /
           "${javaTypeName.simpleName()}.java"
 
-        logger.artifact(modulePath, javaFile)
         try {
           fs.createDirectories(filePath.parent!!)
           fs.write(filePath) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,9 +1,8 @@
 pluginManagement {
   plugins {
-    id("com.github.ben-manes.versions") version "0.41.0"
-    id("com.github.johnrengelman.shadow") version "7.1.1"
-    id("com.gradle.enterprise") version "3.8"
-    id("de.undercouch.download") version "4.1.2"
+    id("com.github.ben-manes.versions") version "0.42.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradle.enterprise") version "3.8.1"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("nebula.release") version "16.0.0"
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
