Merge pull request #121 from LFDT-web3j/upgrade-java

migrate to java 21

Author: gtebrean

CHANGELOG.md

@@ -15,7 +15,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-*
+* Migrate to java 21 [#121](https://github.com/LFDT-web3j/web3j-cli/pull/121)
 
 
 # [1.6.3](https://github.com/hyperledger-web3j/web3j-cli/releases/tag/v1.6.3) (2025-02-10)

build.gradle

@@ -1,7 +1,7 @@
 import java.text.SimpleDateFormat
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id "application"
     id "distribution"
     id "idea"
@@ -150,13 +150,13 @@ sourceSets {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 def generatedResources = "$buildDir/generated-resources/main"
 

gradle/java/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
-sourceCompatibility = 17
-targetCompatibility = 17
+sourceCompatibility = 21
+targetCompatibility = 21
 
 compileJava {
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

src/main/java/org/web3j/console/services/Updater.java

@@ -25,7 +25,7 @@
 
 public class Updater {
     private static final String GITHUB_API_URL =
-            "https://api.github.com/repos/hyperledger-web3j/web3j-cli/releases/latest";
+            "https://api.github.com/repos/LFDT-web3j/web3j-cli/releases/latest";
 
     public static void promptIfUpdateAvailable() throws IOException {
         String version = CliVersion.getVersion(); // Get current version from CLI

src/main/resources/project/Dockerfile.template

@@ -2,7 +2,7 @@
 FROM ubuntu as Build
 COPY . /root/app
 RUN apt-get update && apt-get install -y \
-	curl bash openjdk-17-jre \
+	curl bash openjdk-21-jre \
 	&& rm -rf /var/cache/apk/* \
 	&& curl -L get.web3j.io | sh \
 	&& /root/.web3j/web3j \
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
 
 FROM alpine
 COPY --from=Build /root /root/
-RUN apk add --no-cache bash openjdk17-jre\
+RUN apk add --no-cache bash openjdk21-jre\
 	&& rm -rf /var/cache/apk/* \
 	&& mkdir /opt/app
 WORKDIR /root/app

src/main/resources/project/build.gradle.template

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'application'
     id "com.github.johnrengelman.shadow" version "8.1.1"
     id 'org.web3j' version '4.13.0'
@@ -10,7 +10,7 @@ plugins {
 group '<package_name>'
 version '0.1.0'
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
     mavenLocal()
@@ -84,11 +84,11 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 shadowJar {

src/main/resources/project/build.gradleImport.template

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'application'
     id "com.github.johnrengelman.shadow" version "8.1.1"
     id 'org.web3j' version '4.13.0'
@@ -10,7 +10,7 @@ plugins {
 group '<package_name>'
 version '0.1.0'
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
     mavenLocal()
@@ -84,7 +84,7 @@ test {
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 shadowJar {

src/main/resources/project/erc20/build.gradleErc20.template

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'application'
     id "com.github.johnrengelman.shadow" version "8.1.1"
     id 'org.web3j' version '4.13.0'
@@ -9,7 +9,7 @@ plugins {
 group '<package_name>'
 version '0.1.0'
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
     mavenLocal()
@@ -83,11 +83,11 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 solidity {

src/main/resources/project/erc721/build.gradleErc721.template

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'application'
     id "com.github.johnrengelman.shadow" version "8.1.1"
     id 'org.web3j' version '4.13.0'
@@ -9,7 +9,7 @@ plugins {
 group '<package_name>'
 version '0.1.0'
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
     mavenLocal()
@@ -83,11 +83,11 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 solidity {

src/main/resources/project/erc777/build.gradleErc777.template

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'application'
     id "com.github.johnrengelman.shadow" version "8.1.1"
     id 'org.web3j' version '4.13.0'
@@ -9,7 +9,7 @@ plugins {
 group '<package_name>'
 version '0.1.0'
 
-sourceCompatibility = 17
+sourceCompatibility = 21
 
 repositories {
     mavenLocal()
@@ -65,11 +65,11 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 
 solidity {