Skip to content

Commit a039cff

Browse files
committed
[2.0.0-SNAPSHOT]
All dependencies updated Project structured, codestyle, layout updated Junit -> Jupiter Codestyle updated
1 parent cafcdff commit a039cff

File tree

109 files changed

+1088
-1211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1088
-1211
lines changed

.editorconfig

+17-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,30 @@ root = true
88
end_of_line = lf
99
charset = utf-8
1010

11+
# Json
12+
[*.json]
13+
indent_size = 2
14+
indent_style = space
15+
insert_final_newline = false
16+
trim_trailing_whitespace = true
17+
1118
# Yaml
1219
[{*.yml, *.yaml}]
1320
indent_size = 2
1421
indent_style = space
22+
insert_final_newline = true
23+
trim_trailing_whitespace = true
1524

1625
# Property files
1726
[*.properties]
1827
indent_size = 2
1928
indent_style = space
29+
insert_final_newline = true
30+
trim_trailing_whitespace = true
2031

21-
32+
# XML files
33+
[*.xml]
34+
indent_size = 4
35+
indent_style = space
36+
insert_final_newline = true
37+
trim_trailing_whitespace = true

.gitattributes

+27-8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
# and leave all files detected as binary untouched.
33
* text=auto
44

5-
#
5+
66
# The above will handle all files NOT found below
7-
#
87
# These files are text and should be normalized (Convert crlf => lf)
98
*.bash text eol=lf
109
*.css text diff=css
@@ -26,16 +25,36 @@
2625
*.xml text
2726
*.yml text eol=lf
2827

28+
2929
# These files are binary and should be left untouched
3030
# (binary is a macro for -text -diff)
31-
*.class binary
31+
# Archives
32+
*.7z binary
33+
*.br binary
34+
*.gz binary
35+
*.tar binary
36+
*.zip binary
37+
*.jar binary
38+
*.so binary
39+
*.war binary
3240
*.dll binary
33-
*.ear binary
34-
*.gif binary
41+
42+
# Documents
43+
*.pdf binary
44+
45+
# Images
3546
*.ico binary
36-
*.jar binary
47+
*.gif binary
3748
*.jpg binary
3849
*.jpeg binary
3950
*.png binary
40-
*.so binary
41-
*.war binary
51+
*.psd binary
52+
*.webp binary
53+
54+
# Fonts
55+
*.woff2 binary
56+
57+
# Other
58+
*.exe binary
59+
*.class binary
60+
*.ear binary

.gitignore

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
/.settings/
2-
.idea
3-
.idea/httpRequests
4-
*.iml
1+
### Package Files
2+
*.war
3+
*.nar
4+
*.ear
5+
*.zip
6+
*.tar.gz
7+
*.rar
8+
9+
### Gradle template
510
.gradle
6-
build
11+
build/
712
target/
13+
14+
### Idea generated files
15+
.idea
16+
.settings/
17+
*.iml
18+
out/

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ Library supports all available EtherScan *API* calls for all available *Ethereum
1414

1515
**Gradle**
1616
```groovy
17-
dependencies {
18-
compile "com.github.goodforgod:java-etherscan-api:1.2.1"
19-
}
17+
implementation "com.github.goodforgod:java-etherscan-api:1.3.1"
2018
```
2119

2220
**Maven**
2321
```xml
2422
<dependency>
2523
<groupId>com.github.goodforgod</groupId>
2624
<artifactId>java-etherscan-api</artifactId>
27-
<version>1.2.1</version>
25+
<version>1.3.1</version>
2826
</dependency>
2927
```
3028

build.gradle

+31-26
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id "maven-publish"
55

66
id "org.sonarqube" version "3.3"
7-
id "com.diffplug.spotless" version "5.14.3"
7+
id "com.diffplug.spotless" version "6.1.0"
88
}
99

1010
repositories {
@@ -18,34 +18,22 @@ version = artifactVersion
1818
sourceCompatibility = JavaVersion.VERSION_1_8
1919
targetCompatibility = JavaVersion.VERSION_1_8
2020

21-
spotless {
22-
java {
23-
encoding "UTF-8"
24-
removeUnusedImports()
25-
eclipse().configFile "${projectDir}/config/codestyle.xml"
26-
}
27-
}
28-
29-
sonarqube {
30-
properties {
31-
property "sonar.host.url", "https://sonarcloud.io"
32-
property "sonar.organization", "goodforgod"
33-
property "sonar.projectKey", "GoodforGod_java-etherscan-api"
34-
}
35-
}
36-
3721
dependencies {
38-
implementation "org.jetbrains:annotations:22.0.0"
39-
implementation "com.google.code.gson:gson:2.8.9"
22+
implementation "org.jetbrains:annotations:23.0.0"
23+
implementation "com.google.code.gson:gson:2.9.0"
24+
implementation "io.goodforgod:gson-configuration:1.4.1"
4025

41-
testImplementation "junit:junit:4.13.2"
26+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2"
27+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
28+
testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2"
4229
}
4330

4431
test {
45-
useJUnit()
32+
useJUnitPlatform()
4633
testLogging {
4734
events("passed", "skipped", "failed")
4835
exceptionFormat("full")
36+
showStandardStreams(false)
4937
}
5038

5139
reports {
@@ -54,19 +42,36 @@ test {
5442
}
5543
}
5644

45+
spotless {
46+
java {
47+
encoding("UTF-8")
48+
importOrder()
49+
removeUnusedImports()
50+
eclipse("4.21.0").configFile("${rootDir}/config/codestyle.xml")
51+
}
52+
}
53+
54+
sonarqube {
55+
properties {
56+
property "sonar.host.url", "https://sonarcloud.io"
57+
property "sonar.organization", "goodforgod"
58+
property "sonar.projectKey", "GoodforGod_$artifactId"
59+
}
60+
}
61+
5762
publishing {
5863
publications {
5964
mavenJava(MavenPublication) {
6065
from components.java
6166

6267
pom {
6368
name = "Java Etherscan API"
64-
url = "https://github.com/GoodforGod/java-etherscan-api"
69+
url = "https://github.com/GoodforGod/$artifactId"
6570
description = "Library is a wrapper for EtherScan API."
6671

6772
license {
6873
name = "MIT License"
69-
url = "https://github.com/GoodforGod/java-etherscan-api/blob/master/LICENSE"
74+
url = "https://github.com/GoodforGod/$artifactId/blob/master/LICENSE"
7075
distribution = "repo"
7176
}
7277

@@ -78,9 +83,9 @@ publishing {
7883
}
7984

8085
scm {
81-
connection = "scm:git:git://github.com/GoodforGod/java-etherscan-api.git"
82-
developerConnection = "scm:git:ssh://GoodforGod/java-etherscan-api.git"
83-
url = "https://github.com/GoodforGod/java-etherscan-api/tree/master"
86+
connection = "scm:git:git://github.com/GoodforGod/${artifactId}.git"
87+
developerConnection = "scm:git:ssh://GoodforGod/${artifactId}.git"
88+
url = "https://github.com/GoodforGod/$artifactId/tree/master"
8489
}
8590
}
8691
}

0 commit comments

Comments
 (0)