diff --git a/build.gradle b/build.gradle index 428bec5..b5626ed 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ mainClassName = 'org.web3j.console.Web3j' applicationName = 'web3j' ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' picocli = '4.6.0' slf4jVersion = '1.7.30' junitVersion = '5.8.2' diff --git a/src/main/java/org/web3j/console/project/utils/ProjectUtils.java b/src/main/java/org/web3j/console/project/utils/ProjectUtils.java index 4cad3b5..be0d190 100644 --- a/src/main/java/org/web3j/console/project/utils/ProjectUtils.java +++ b/src/main/java/org/web3j/console/project/utils/ProjectUtils.java @@ -167,6 +167,7 @@ public static Boolean isSmartContract(File file) { * * @param directory directory where to search for Solidity smart contracts * @return List of contracts paths + * @throws IOException if path is not available */ public static List findSolidityContracts(Path directory) throws IOException { return Files.walk(directory) diff --git a/src/main/resources/project/build.gradle.template b/src/main/resources/project/build.gradle.template index f0e6626..fa3eec7 100644 --- a/src/main/resources/project/build.gradle.template +++ b/src/main/resources/project/build.gradle.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } @@ -14,7 +14,10 @@ sourceCompatibility = 1.8 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -22,15 +25,21 @@ web3j { excludedContracts = ['Mortal'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/build.gradleGenerateOpenApi.template b/src/main/resources/project/build.gradleGenerateOpenApi.template index a8c2aef..ce2d3ab 100644 --- a/src/main/resources/project/build.gradleGenerateOpenApi.template +++ b/src/main/resources/project/build.gradleGenerateOpenApi.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" } group '' diff --git a/src/main/resources/project/build.gradleImport.template b/src/main/resources/project/build.gradleImport.template index b3482b2..16e5220 100644 --- a/src/main/resources/project/build.gradleImport.template +++ b/src/main/resources/project/build.gradleImport.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } @@ -21,15 +21,21 @@ web3j { generatedPackageName = '.generated.contracts' } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/build.gradleImportJava11.template b/src/main/resources/project/build.gradleImportJava11.template index 58075e8..4385af6 100644 --- a/src/main/resources/project/build.gradleImportJava11.template +++ b/src/main/resources/project/build.gradleImportJava11.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,22 +13,31 @@ sourceCompatibility = 11 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { generatedPackageName = '.generated.contracts' } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/build.gradleImportOpenApi.template b/src/main/resources/project/build.gradleImportOpenApi.template index 80c3c56..b4eda2b 100644 --- a/src/main/resources/project/build.gradleImportOpenApi.template +++ b/src/main/resources/project/build.gradleImportOpenApi.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" } group '' diff --git a/src/main/resources/project/build.gradleJarOpenApi.template b/src/main/resources/project/build.gradleJarOpenApi.template index 12d43b6..60118e4 100644 --- a/src/main/resources/project/build.gradleJarOpenApi.template +++ b/src/main/resources/project/build.gradleJarOpenApi.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" id "com.github.johnrengelman.shadow" version "5.2.0" } diff --git a/src/main/resources/project/build.gradleJava11.template b/src/main/resources/project/build.gradleJava11.template index cd011e8..325d7e5 100644 --- a/src/main/resources/project/build.gradleJava11.template +++ b/src/main/resources/project/build.gradleJava11.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,7 +13,10 @@ sourceCompatibility = 11 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -21,15 +24,21 @@ web3j { excludedContracts = ['Mortal'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation("org.web3j:web3j-unit:$web3jVersion") implementation("org.web3j:web3j-evm:$web3jVersion") implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/build.gradleOpenApi.template b/src/main/resources/project/build.gradleOpenApi.template index 3b4f137..3ebc4ea 100644 --- a/src/main/resources/project/build.gradleOpenApi.template +++ b/src/main/resources/project/build.gradleOpenApi.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" } group '' diff --git a/src/main/resources/project/erc20/build.gradleErc20.template b/src/main/resources/project/erc20/build.gradleErc20.template index 93718af..50b5c2a 100644 --- a/src/main/resources/project/erc20/build.gradleErc20.template +++ b/src/main/resources/project/erc20/build.gradleErc20.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,7 +13,10 @@ sourceCompatibility = 1.8 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -21,15 +24,21 @@ web3j { includedContracts = ['ERC20Token'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/erc20/build.gradleErc20Java11.template b/src/main/resources/project/erc20/build.gradleErc20Java11.template index e924c28..c4e816d 100644 --- a/src/main/resources/project/erc20/build.gradleErc20Java11.template +++ b/src/main/resources/project/erc20/build.gradleErc20Java11.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,7 +13,10 @@ sourceCompatibility = 11 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -21,15 +24,21 @@ web3j { includedContracts = ['ERC20Token'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/erc20/build.gradleOpenApiErc20.template b/src/main/resources/project/erc20/build.gradleOpenApiErc20.template index d0e792c..ed59bd3 100644 --- a/src/main/resources/project/erc20/build.gradleOpenApiErc20.template +++ b/src/main/resources/project/erc20/build.gradleOpenApiErc20.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" } group '' diff --git a/src/main/resources/project/erc777/build.gradleErc777.template b/src/main/resources/project/erc777/build.gradleErc777.template index 4d3b94f..eb6457f 100644 --- a/src/main/resources/project/erc777/build.gradleErc777.template +++ b/src/main/resources/project/erc777/build.gradleErc777.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,7 +13,10 @@ sourceCompatibility = 1.8 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -21,15 +24,21 @@ web3j { includedContracts = ['ERC777Token'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' logbackVersion = '1.2.3' + klaxonVersion = '5.5' } dependencies { implementation "org.web3j:core:$web3jVersion", "ch.qos.logback:logback-core:$logbackVersion", - "ch.qos.logback:logback-classic:$logbackVersion" + "ch.qos.logback:logback-classic:$logbackVersion", + "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/erc777/build.gradleErc777Java11.template b/src/main/resources/project/erc777/build.gradleErc777Java11.template index 812010b..3d6d5a1 100644 --- a/src/main/resources/project/erc777/build.gradleErc777Java11.template +++ b/src/main/resources/project/erc777/build.gradleErc777Java11.template @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'application' id "com.github.johnrengelman.shadow" version "5.2.0" - id 'org.web3j' version '4.8.4' + id 'org.web3j' version '4.9.4' } group '' @@ -13,7 +13,10 @@ sourceCompatibility = 11 repositories { mavenCentral() - jcenter() + maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } + maven { url "https://artifacts.consensys.net/public/maven/maven/" } + maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } + maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } web3j { @@ -21,11 +24,17 @@ web3j { includedContracts = ['ERC777Token'] } +node { + nodeProjectDir.set(file("$projectDir")) +} + ext { - web3jVersion = '4.8.4' + web3jVersion = '4.9.4' + klaxonVersion = '5.5' } dependencies { + implementation "com.beust:klaxon:$klaxonVersion" implementation "org.web3j:web3j-unit:$web3jVersion" implementation "org.web3j:web3j-evm:$web3jVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" diff --git a/src/main/resources/project/erc777/build.gradleOpenApiErc777.template b/src/main/resources/project/erc777/build.gradleOpenApiErc777.template index 8c99f34..eaa641a 100644 --- a/src/main/resources/project/erc777/build.gradleOpenApiErc777.template +++ b/src/main/resources/project/erc777/build.gradleOpenApiErc777.template @@ -1,5 +1,5 @@ plugins { - id "org.web3j.openapi" version "4.8.3" + id "org.web3j.openapi" version "4.9.4" } group ''