Sfoglia il codice sorgente

Upgrade Gradle and build dependencies (#5775)

Anuraag Agrawal 2 anni fa
parent
commit
a48ecd0365

+ 4 - 4
conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.1.2"
+  id("com.diffplug.spotless") version "6.4.2"
 }
 
 spotless {
@@ -39,12 +39,12 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.3.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.4.2")
   implementation("com.google.guava:guava:31.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-  implementation("org.ow2.asm:asm:9.2")
-  implementation("org.ow2.asm:asm-tree:9.2")
+  implementation("org.ow2.asm:asm:9.3")
+  implementation("org.ow2.asm:asm-tree:9.3")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
   implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.5.4")

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 5 - 5
settings.gradle.kts

@@ -2,18 +2,18 @@ pluginManagement {
   plugins {
     id("com.github.ben-manes.versions") version "0.42.0"
     id("com.github.jk1.dependency-license-report") version "2.1"
-    id("com.gradle.plugin-publish") version "0.20.0"
+    id("com.gradle.plugin-publish") version "1.0.0-rc-1"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("org.jetbrains.kotlin.jvm") version "1.6.10"
+    id("org.jetbrains.kotlin.jvm") version "1.6.20"
     id("org.unbroken-dome.test-sets") version "4.0.0"
     id("org.xbib.gradle.plugin.jflex") version "1.6.0"
   }
 }
 
 plugins {
-  id("com.gradle.enterprise") version "3.8.1"
-  id("com.github.burrunan.s3-build-cache") version "1.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.2"
+  id("com.gradle.enterprise") version "3.9"
+  id("com.github.burrunan.s3-build-cache") version "1.3"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
 }
 
 dependencyResolutionManagement {