Merge pull request #98 from LFDT-web3j/upgrade_to_21

upgrade versions

Author: gtebrean

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

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.13.1]() (Upcoming)
+# [4.14.0]() (Upcoming)
 
 ### Bug Fixes
 
@@ -15,7 +15,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-*
+* Migrate to java 21 [#98](https://github.com/LFDT-web3j/web3j-gradle-plugin/pull/98)
 
 # [4.13.0](https://github.com/hyperledger-web3j/web3j-gradle-plugin/releases/tag/v4.13.0) (2024-03-07)
 

build.gradle

@@ -12,7 +12,7 @@ plugins {
 description = 'Gradle plugin providing tasks to generate Web3j contracts from Solidity.'
 
 java {
-    sourceCompatibility = 17
+    sourceCompatibility = 21
 }
 
 ext {
@@ -29,7 +29,7 @@ apply {
         'junit'
     ].each { buildScript ->
         download.run {
-            src "https://raw.githubusercontent.com/hyperledger-web3j/web3j-build-tools/main/gradle/$buildScript/build.gradle"
+            src "https://raw.githubusercontent.com/LFDT-web3j/web3j-build-tools/main/gradle/$buildScript/build.gradle"
             dest "$rootDir/gradle/$buildScript/build.gradle"
             overwrite true
             quiet true
@@ -67,7 +67,7 @@ dependencies {
 
 gradlePlugin {
     website = 'https://web3j.io/'
-    vcsUrl = 'https://github.com/hyperledger-web3j/web3j-gradle-plugin'
+    vcsUrl = 'https://github.com/LFDT-web3j/web3j-gradle-plugin'
     plugins {
         web3j {
             description = 'Gradle plugin providing tasks to generate web3j contracts from Solidity.'

gradle.properties

@@ -1,6 +1,6 @@
 group=org.web3j
-version=4.13.0
+version=4.14.0
 org.gradle.caching=true
 org.gradle.parallel=true
-solidityPluginVersion=0.5.2
-kotlinVersion=1.9.24
+solidityPluginVersion=0.6.0
+kotlinVersion=2.1.0

gradle/java/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'java'
 
 java {
-    sourceCompatibility = 17
-    targetCompatibility = 17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
-
 compileJava {
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 }

gradle/repositories/build.gradle

@@ -1,6 +1,5 @@
 repositories {
     mavenCentral()
-    jcenter()
     maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }

gradle/spotless/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'com.diffplug.spotless'
 apply plugin: "de.undercouch.download"
 
 task downloadJavaLicense(type: Download) {
-    src 'https://raw.githubusercontent.com/hyperledger-web3j/web3j-build-tools/main/gradle/spotless/java.license'
+    src 'https://raw.githubusercontent.com/LFDT-web3j/web3j-build-tools/main/gradle/spotless/java.license'
     dest new File("$rootDir/gradle/spotless",'java.license')
     quiet true
     onlyIfModified true
 }
 
 task downloadFormatterProperties(type: Download) {
-    src 'https://raw.githubusercontent.com/hyperledger-web3j/web3j-build-tools/main/gradle/spotless/formatter.properties'
+    src 'https://raw.githubusercontent.com/LFDT-web3j/web3j-build-tools/main/gradle/spotless/formatter.properties'
     dest new File("$rootDir/gradle/spotless",'formatter.properties')
     quiet true
     onlyIfModified true