Merge pull request #30 from hyperledger/upgradeGradle8.7

Upgrade gradle to 8.7

CHANGELOG.md

@@ -3,7 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.2.5]() (Upcoming)
+# [0.4.0]() (Upcoming)
+
+### Bug Fixes
+
+* NIL
+
+### Features
+
+* 
+
+### BREAKING CHANGES
+
+* Updated Gradle to 8.7 [#30](https://github.com/hyperledger/web3j-sokt/pull/30)
+
+# [0.3.0](https://github.com/hyperledger/web3j-sokt/releases/tag/v0.3.0) (2024-04-17)
 
 ### Bug Fixes
 

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.9.24'
     repositories { jcenter() }
 
     dependencies {
@@ -12,16 +12,16 @@ 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 "$kotlin_version"
     id 'de.undercouch.download' version '4.1.2'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'
+    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.10"
 }
 
 description 'web3j-sokt - Kotlin-based wrapper for multiple installations of the solidity compiler (solc)'
@@ -59,12 +59,12 @@ repositories {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
-            "org.apache.commons:commons-lang3:3.0",
-            "com.github.zafarkhaja:java-semver:0.9.0",
-            "org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.3",
-            "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3",
-            "org.jetbrains.kotlin:kotlin-serialization:1.8.10"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version",
+            "org.apache.commons:commons-lang3:3.14.0",
+            "com.github.zafarkhaja:java-semver:0.10.2",
+            "org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3",
+            "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3",
+            "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion",
             "org.junit.jupiter:junit-jupiter-api:$junitVersion",
             "org.junit.jupiter:junit-jupiter-params:$junitVersion"

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style=official
-version=0.2.5-SNAPSHOT
+version=0.4.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.enabled = true }
+    reports {
+        xml.required.set(true)
+    }
 
     doFirst {
         getExecutionData().from(executionData.findAll { it.exists() })

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) {
@@ -26,7 +26,7 @@ spotless {
             exclude '**/build/install/**'
         }
         removeUnusedImports()
-        googleJavaFormat("1.7").aosp()
+        googleJavaFormat("1.17.0").aosp()
         importOrder 'java', '', 'org.web3j', '\\#'
         trimTrailingWhitespace()
         endWithNewline()
@@ -39,7 +39,7 @@ spotless {
             exclude '**/.gradle/**'
             exclude '**/build/install/**'
         }
-        ktlint('0.31.0')
+        ktlint('0.49.1')
         trimTrailingWhitespace()
         endWithNewline()
         licenseHeaderFile "$rootDir/gradle/spotless/java.license"
@@ -52,4 +52,19 @@ spotless {
     }
 }
 
-spotlessCheck.dependsOn('downloadJavaLicense', 'downloadFormatterProperties')
+tasks.named('spotlessJava') {
+    dependsOn downloadJavaLicense, downloadFormatterProperties
+    dependsOn tasks.named('compileJava'), tasks.named('compileTestJava'), tasks.named('processResources'), tasks.named('processTestResources')
+    mustRunAfter tasks.named('spotlessGroovyGradle'), tasks.named('test'), tasks.named('jacocoTestReport')
+}
+
+tasks.named('spotlessKotlin') {
+    dependsOn downloadJavaLicense, downloadFormatterProperties
+    dependsOn tasks.named('compileJava'), tasks.named('compileTestJava'), tasks.named('processResources'), tasks.named('processTestResources'), tasks.named('spotlessJava')
+    mustRunAfter tasks.named('spotlessGroovyGradle'), tasks.named('test'), tasks.named('jacocoTestReport')
+}
+
+tasks.named('spotlessCheck') {
+    dependsOn downloadJavaLicense, downloadFormatterProperties, tasks.named('spotlessJava'), tasks.named('spotlessKotlin'), tasks.named('spotlessGroovyGradle')
+    mustRunAfter tasks.named('jacocoTestReport'), tasks.named('test')
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Thu Mar 05 14:16:43 GMT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists