Merge pull request #97 from web3j/update_to_4.10.0

Update to 4.10.1 Web3J

Author: gtebrean

build.gradle

@@ -1,7 +1,7 @@
 import java.text.SimpleDateFormat
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     id "application"
     id "distribution"
     id "idea"
@@ -19,7 +19,7 @@ mainClassName = 'org.web3j.console.Web3j'
 applicationName = 'web3j'
 
 ext {
-    web3jVersion = '4.9.4'
+    web3jVersion = '4.10.1'
     picocli = '4.6.0'
     slf4jVersion = '1.7.30'
     junitVersion = '5.8.2'
@@ -61,6 +61,7 @@ apply {
 repositories {
     jcenter()
     mavenCentral()
+    mavenLocal()
     maven { url "https://dl.bintray.com/ethereum/maven/" }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url 'https://repo.gradle.org/gradle/libs-releases' }
@@ -153,13 +154,13 @@ sourceSets {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "17"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "17"
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 def generatedResources = "$buildDir/generated-resources/main"
 
@@ -179,3 +180,6 @@ task generateVersionProperties {
         generated.append("timestamp=${System.currentTimeMillis()}\n")
     }
 }
+
+tasks.named("spotlessJava").configure { dependsOn("javadoc","sourcesJar","compileTestJava","compileTestKotlin") }
+tasks.named("spotlessKotlin").configure { dependsOn("compileKotlin","sourcesJar","compileTestKotlin") }

gradle.properties

@@ -1,2 +1,2 @@
-version=1.4.2
+version=1.5.0
 group=org.web3j.console

gradle/jacoco/build.gradle

@@ -26,6 +26,6 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 }
 
 jacoco {
-    toolVersion = "0.8.4"
+    toolVersion = "0.8.10"
 }
 

gradle/java/build.gradle

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

gradle/repositories/build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

src/main/java/org/web3j/console/project/ProjectRunner.java

@@ -89,7 +89,7 @@ public void run() {
     protected abstract void createProject();
 
     public void buildProject(ProjectStructure projectStructure, ProgressCounter progressCounter)
-            throws IOException, InterruptedException {
+            throws IOException, InterruptedException, ClassNotFoundException {
         ProjectCreationUtils.generateWrappers(projectStructure.getProjectRoot());
         if (withTests) {
             new JavaTestCLIRunner(

src/main/java/org/web3j/console/project/java/Erc20JavaProjectCreator.java

@@ -12,7 +12,6 @@
  */
 package org.web3j.console.project.java;
 
-import org.web3j.commons.JavaVersion;
 import org.web3j.console.openapi.project.erc777.CopyUtils;
 import org.web3j.console.openapi.utils.PrettyPrinter;
 import org.web3j.console.openapi.utils.SimpleFileLogger;
@@ -51,10 +50,7 @@ protected void createProject() {
                     .withGradleSettings("project/settings.gradle.template")
                     .withWrapperGradleSettings("project/gradlew-wrapper.properties.template")
                     .withGradlewWrapperJar("gradle-wrapper.jar")
-                    .withGradleBuild(
-                            JavaVersion.getJavaVersionAsDouble() < 11
-                                    ? "project/erc20/build.gradleErc20.template"
-                                    : "project/erc20/build.gradleErc20Java11.template")
+                    .withGradleBuild("project/erc20/build.gradleErc20.template")
                     .withMainJavaClass("project/erc20/JavaErc20.template")
                     .build()
                     .generateFiles(projectStructure);

src/main/java/org/web3j/console/project/java/Erc777JavaProjectCreator.java

@@ -12,7 +12,6 @@
  */
 package org.web3j.console.project.java;
 
-import org.web3j.commons.JavaVersion;
 import org.web3j.console.openapi.project.erc777.CopyUtils;
 import org.web3j.console.openapi.utils.PrettyPrinter;
 import org.web3j.console.openapi.utils.SimpleFileLogger;
@@ -52,10 +51,7 @@ protected void createProject() {
                     .withGradleSettings("project/settings.gradle.template")
                     .withWrapperGradleSettings("project/gradlew-wrapper.properties.template")
                     .withGradlewWrapperJar("gradle-wrapper.jar")
-                    .withGradleBuild(
-                            JavaVersion.getJavaVersionAsDouble() < 11
-                                    ? "project/erc777/build.gradleErc777.template"
-                                    : "project/erc777/build.gradleErc777Java11.template")
+                    .withGradleBuild("project/erc777/build.gradleErc777.template")
                     .withMainJavaClass("project/erc777/JavaErc777.template")
                     .withReadme("project/erc777/README.erc777.md")
                     .build()

src/main/java/org/web3j/console/project/java/JavaProject.java

@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 
-import org.web3j.commons.JavaVersion;
 import org.web3j.console.project.AbstractProject;
 import org.web3j.console.project.Project;
 import org.web3j.console.project.ProjectStructure;
@@ -58,18 +57,12 @@ public JavaTemplateProvider getTemplateProvider() {
 
         if (command.equals("new")) {
             templateBuilder
-                    .withGradleBuild(
-                            JavaVersion.getJavaVersionAsDouble() < 11
-                                    ? "project/build.gradle.template"
-                                    : "project/build.gradleJava11.template")
+                    .withGradleBuild("project/build.gradle.template")
                     .withSolidityProject("contracts/HelloWorld.sol");
 
         } else if (command.equals("import")) {
             templateBuilder
-                    .withGradleBuild(
-                            JavaVersion.getJavaVersionAsDouble() < 11
-                                    ? "project/build.gradleImport.template"
-                                    : "project/build.gradleImportJava11.template")
+                    .withGradleBuild("project/build.gradleImport.template")
                     .withPathToSolidityFolder(solidityImportPath);
         }