Merge pull request #110 from hyperledger/upgradeGradle8.7

Upgrade to gradle 8.7

Author: gtebrean

CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.11.4]() (Upcoming)
+# [4.12.0]() (Upcoming)
 
 ### Bug Fixes
 
@@ -15,7 +15,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-* 
+* Upgrade gradle to 8.7 and removed Consensys Repo dependency [#110](https://github.com/hyperledger/web3j-evm/pull/110)
 
 # [4.11.3](https://github.com/hyperledger/web3j-evm/releases/tag/v4.11.3) (2024-05-01)
 

build.gradle

@@ -4,22 +4,22 @@ plugins {
     id 'idea'
     id 'jacoco'
     id 'com.jfrog.bintray' version '1.8.4'
-    id 'com.diffplug.gradle.spotless' version '4.5.1'
-    id 'io.codearte.nexus-staging' version '0.21.1'
+    id 'com.diffplug.spotless' version '6.25.0'
+    id 'io.codearte.nexus-staging' version '0.30.0'
     id 'de.marcphilipp.nexus-publish' version '0.4.0'
-    id 'org.jetbrains.kotlin.jvm' version '1.8.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
     id 'de.undercouch.download' version '4.1.2'
 }
 
 description 'Web3j-evm extension'
 
 ext {
-    web3jVersion = '4.11.3'
-    log4jVersion = '2.15.0'
-    guavaVersion = '28.1-jre'
+    web3jVersion = '4.12.0-SNAPSHOT'
+    log4jVersion = '2.23.1'
+    guavaVersion = '33.2.0-jre'
     jacksonVersion = '2.10.0'
-    klaxonVersion = '5.0.1'
-    kotlinVersion = '1.8.10'
+    klaxonVersion = '5.6'
+    kotlinVersion = '1.9.24'
     besuPluginVersion = '24.1.1'
     besuInternalVersion = '24.1.1'
     besuInternalCryptoVersion = '23.1.3'
@@ -51,7 +51,6 @@ apply {
 repositories {
     mavenCentral()
     maven { url "https://hyperledger.jfrog.io/artifactory/besu-maven/" }
-    maven { url "https://artifacts.consensys.net/public/maven/maven/" }
     maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
 }
 

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
 group=org.web3j
-version=4.11.4-SNAPSHOT
+version=4.12.0-SNAPSHOT

gradle/jacoco/build.gradle

@@ -6,7 +6,9 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
     getClassDirectories().from(subprojects.sourceSets.main.output)
     getExecutionData().from(subprojects.jacocoTestReport.executionData)
-    reports { xml.required = true }
+    reports {
+        xml.required.set(true)
+    }
 
     doFirst {
         getExecutionData().from(executionData.findAll { it.exists() })

gradle/junit/build.gradle

@@ -1,5 +1,5 @@
 ext {
-    junitVersion = '5.5.2'
+    junitVersion = '5.9.3'
 }
 
 dependencies {

gradle/spotless/build.gradle

@@ -1,5 +1,5 @@
 
-apply plugin: 'com.diffplug.gradle.spotless'
+apply plugin: 'com.diffplug.spotless'
 apply plugin: "de.undercouch.download"
 
 task downloadJavaLicense(type: Download) {
@@ -27,7 +27,7 @@ spotless {
             exclude '**/build/install/**'
         }
         removeUnusedImports()
-        googleJavaFormat("1.7").aosp()
+        googleJavaFormat("1.17.0").aosp()
         importOrder 'java', '', 'org.web3j', '\\#'
         trimTrailingWhitespace()
         endWithNewline()
@@ -40,7 +40,7 @@ spotless {
             exclude '**/.gradle/**'
             exclude '**/build/install/**'
         }
-        ktlint('0.31.0')
+        ktlint('0.49.1')
         trimTrailingWhitespace()
         endWithNewline()
         licenseHeaderFile "$rootDir/gradle/spotless/java.license"

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists