Skip to content

Commit ee91375

Browse files
gtebreangtebrean
authored
Merge pull request #86 from gtebrean/fix/node-path
place node_modules folder at project root level
2 parents 45c2e09 + 7391c1a commit ee91375

16 files changed

+107
-37
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mainClassName = 'org.web3j.console.Web3j'
1919
applicationName = 'web3j'
2020

2121
ext {
22-
web3jVersion = '4.8.4'
22+
web3jVersion = '4.9.4'
2323
picocli = '4.6.0'
2424
slf4jVersion = '1.7.30'
2525
junitVersion = '5.8.2'

‎src/main/java/org/web3j/console/project/utils/ProjectUtils.java

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ public static Boolean isSmartContract(File file) {
167167
*
168168
* @param directory directory where to search for Solidity smart contracts
169169
* @return List of contracts paths
170+
* @throws IOException if path is not available
170171
*/
171172
public static List<Path> findSolidityContracts(Path directory) throws IOException {
172173
return Files.walk(directory)

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99

@@ -14,23 +14,32 @@ sourceCompatibility = 1.8
1414

1515
repositories {
1616
mavenCentral()
17-
jcenter()
17+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
18+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
19+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
20+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1821
}
1922

2023
web3j {
2124
generatedPackageName = '<package_name>.generated.contracts'
2225
excludedContracts = ['Mortal']
2326
}
2427

28+
node {
29+
nodeProjectDir.set(file("$projectDir"))
30+
}
31+
2532
ext {
26-
web3jVersion = '4.8.4'
33+
web3jVersion = '4.9.4'
2734
logbackVersion = '1.2.3'
35+
klaxonVersion = '5.5'
2836
}
2937

3038
dependencies {
3139
implementation "org.web3j:core:$web3jVersion",
3240
"ch.qos.logback:logback-core:$logbackVersion",
33-
"ch.qos.logback:logback-classic:$logbackVersion"
41+
"ch.qos.logback:logback-classic:$logbackVersion",
42+
"com.beust:klaxon:$klaxonVersion"
3443
implementation "org.web3j:web3j-unit:$web3jVersion"
3544
implementation "org.web3j:web3j-evm:$web3jVersion"
3645
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/build.gradleGenerateOpenApi.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.web3j.openapi" version "4.8.3"
2+
id "org.web3j.openapi" version "4.9.4"
33
}
44

55
group '<package_name>'

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99

@@ -21,15 +21,21 @@ web3j {
2121
generatedPackageName = '<package_name>.generated.contracts'
2222
}
2323

24+
node {
25+
nodeProjectDir.set(file("$projectDir"))
26+
}
27+
2428
ext {
25-
web3jVersion = '4.8.4'
29+
web3jVersion = '4.9.4'
2630
logbackVersion = '1.2.3'
31+
klaxonVersion = '5.5'
2732
}
2833

2934
dependencies {
3035
implementation "org.web3j:core:$web3jVersion",
3136
"ch.qos.logback:logback-core:$logbackVersion",
32-
"ch.qos.logback:logback-classic:$logbackVersion"
37+
"ch.qos.logback:logback-classic:$logbackVersion",
38+
"com.beust:klaxon:$klaxonVersion"
3339
implementation "org.web3j:web3j-unit:$web3jVersion"
3440
implementation "org.web3j:web3j-evm:$web3jVersion"
3541
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/build.gradleImportJava11.template

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,22 +13,31 @@ sourceCompatibility = 11
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
}
2225

26+
node {
27+
nodeProjectDir.set(file("$projectDir"))
28+
}
29+
2330
ext {
24-
web3jVersion = '4.8.4'
31+
web3jVersion = '4.9.4'
2532
logbackVersion = '1.2.3'
33+
klaxonVersion = '5.5'
2634
}
2735

2836
dependencies {
2937
implementation "org.web3j:core:$web3jVersion",
3038
"ch.qos.logback:logback-core:$logbackVersion",
31-
"ch.qos.logback:logback-classic:$logbackVersion"
39+
"ch.qos.logback:logback-classic:$logbackVersion",
40+
"com.beust:klaxon:$klaxonVersion"
3241
implementation "org.web3j:web3j-unit:$web3jVersion"
3342
implementation "org.web3j:web3j-evm:$web3jVersion"
3443
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/build.gradleImportOpenApi.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.web3j.openapi" version "4.8.3"
2+
id "org.web3j.openapi" version "4.9.4"
33
}
44

55
group '<package_name>'

‎src/main/resources/project/build.gradleJarOpenApi.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.web3j.openapi" version "4.8.3"
2+
id "org.web3j.openapi" version "4.9.4"
33
id "com.github.johnrengelman.shadow" version "5.2.0"
44
}
55

‎src/main/resources/project/build.gradleJava11.template

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,23 +13,32 @@ sourceCompatibility = 11
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
excludedContracts = ['Mortal']
2225
}
2326

27+
node {
28+
nodeProjectDir.set(file("$projectDir"))
29+
}
30+
2431
ext {
25-
web3jVersion = '4.8.4'
32+
web3jVersion = '4.9.4'
2633
logbackVersion = '1.2.3'
34+
klaxonVersion = '5.5'
2735
}
2836

2937
dependencies {
3038
implementation "org.web3j:core:$web3jVersion",
3139
"ch.qos.logback:logback-core:$logbackVersion",
32-
"ch.qos.logback:logback-classic:$logbackVersion"
40+
"ch.qos.logback:logback-classic:$logbackVersion",
41+
"com.beust:klaxon:$klaxonVersion"
3342
implementation("org.web3j:web3j-unit:$web3jVersion")
3443
implementation("org.web3j:web3j-evm:$web3jVersion")
3544
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/build.gradleOpenApi.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.web3j.openapi" version "4.8.3"
2+
id "org.web3j.openapi" version "4.9.4"
33
}
44

55
group '<package_name>'

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,23 +13,32 @@ sourceCompatibility = 1.8
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
includedContracts = ['ERC20Token']
2225
}
2326

27+
node {
28+
nodeProjectDir.set(file("$projectDir"))
29+
}
30+
2431
ext {
25-
web3jVersion = '4.8.4'
32+
web3jVersion = '4.9.4'
2633
logbackVersion = '1.2.3'
34+
klaxonVersion = '5.5'
2735
}
2836

2937
dependencies {
3038
implementation "org.web3j:core:$web3jVersion",
3139
"ch.qos.logback:logback-core:$logbackVersion",
32-
"ch.qos.logback:logback-classic:$logbackVersion"
40+
"ch.qos.logback:logback-classic:$logbackVersion",
41+
"com.beust:klaxon:$klaxonVersion"
3342
implementation "org.web3j:web3j-unit:$web3jVersion"
3443
implementation "org.web3j:web3j-evm:$web3jVersion"
3544
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/erc20/build.gradleErc20Java11.template

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,23 +13,32 @@ sourceCompatibility = 11
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
includedContracts = ['ERC20Token']
2225
}
2326

27+
node {
28+
nodeProjectDir.set(file("$projectDir"))
29+
}
30+
2431
ext {
25-
web3jVersion = '4.8.4'
32+
web3jVersion = '4.9.4'
2633
logbackVersion = '1.2.3'
34+
klaxonVersion = '5.5'
2735
}
2836

2937
dependencies {
3038
implementation "org.web3j:core:$web3jVersion",
3139
"ch.qos.logback:logback-core:$logbackVersion",
32-
"ch.qos.logback:logback-classic:$logbackVersion"
40+
"ch.qos.logback:logback-classic:$logbackVersion",
41+
"com.beust:klaxon:$klaxonVersion"
3342
implementation "org.web3j:web3j-unit:$web3jVersion"
3443
implementation "org.web3j:web3j-evm:$web3jVersion"
3544
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/erc20/build.gradleOpenApiErc20.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.web3j.openapi" version "4.8.3"
2+
id "org.web3j.openapi" version "4.9.4"
33
}
44

55
group '<package_name>'

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,23 +13,32 @@ sourceCompatibility = 1.8
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
includedContracts = ['ERC777Token']
2225
}
2326

27+
node {
28+
nodeProjectDir.set(file("$projectDir"))
29+
}
30+
2431
ext {
25-
web3jVersion = '4.8.4'
32+
web3jVersion = '4.9.4'
2633
logbackVersion = '1.2.3'
34+
klaxonVersion = '5.5'
2735
}
2836

2937
dependencies {
3038
implementation "org.web3j:core:$web3jVersion",
3139
"ch.qos.logback:logback-core:$logbackVersion",
32-
"ch.qos.logback:logback-classic:$logbackVersion"
40+
"ch.qos.logback:logback-classic:$logbackVersion",
41+
"com.beust:klaxon:$klaxonVersion"
3342
implementation "org.web3j:web3j-unit:$web3jVersion"
3443
implementation "org.web3j:web3j-evm:$web3jVersion"
3544
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

‎src/main/resources/project/erc777/build.gradleErc777Java11.template

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
44
id 'application'
55
id "com.github.johnrengelman.shadow" version "5.2.0"
6-
id 'org.web3j' version '4.8.4'
6+
id 'org.web3j' version '4.9.4'
77
}
88

99
group '<package_name>'
@@ -13,19 +13,28 @@ sourceCompatibility = 11
1313

1414
repositories {
1515
mavenCentral()
16-
jcenter()
16+
maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
17+
maven { url "https://artifacts.consensys.net/public/maven/maven/" }
18+
maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
19+
maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
1720
}
1821

1922
web3j {
2023
generatedPackageName = '<package_name>.generated.contracts'
2124
includedContracts = ['ERC777Token']
2225
}
2326

27+
node {
28+
nodeProjectDir.set(file("$projectDir"))
29+
}
30+
2431
ext {
25-
web3jVersion = '4.8.4'
32+
web3jVersion = '4.9.4'
33+
klaxonVersion = '5.5'
2634
}
2735

2836
dependencies {
37+
implementation "com.beust:klaxon:$klaxonVersion"
2938
implementation "org.web3j:web3j-unit:$web3jVersion"
3039
implementation "org.web3j:web3j-evm:$web3jVersion"
3140
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

0 commit comments

Comments
 (0)