Skip to content

Commit c027fe6

Browse files
committed
[0.9.0-SNAPSHOT]
codestyle.xml updated and moved to upper level .editorconfig updated .gitignore updated build.gradle updated and plugins updated Gradle wrapper updated
1 parent c33183b commit c027fe6

File tree

8 files changed

+253
-170
lines changed

8 files changed

+253
-170
lines changed

Diff for: .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

Diff for: .gitignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Package Files #
1+
### Package Files
22
*.war
33
*.nar
44
*.ear
@@ -9,9 +9,10 @@
99
### Gradle template
1010
.gradle
1111
build/
12+
target/
1213

13-
# Idea generatted files
14+
### Idea generated files
1415
.idea
15-
/out/
16-
*.iml
1716
.settings/
17+
*.iml
18+
out/

Diff for: build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id "java-library"
55

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

1010
repositories {
@@ -24,14 +24,16 @@ spotless {
2424
encoding("UTF-8")
2525
importOrder()
2626
removeUnusedImports()
27-
eclipse().configFile("${projectDir}/config/codestyle.xml")
27+
eclipse("4.21.0").configFile("${projectDir}/codestyle.xml")
2828
}
2929
}
3030

3131
dependencies {
32-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
33-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
34-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.1"
32+
implementation "org.jetbrains:annotations:22.0.0"
33+
34+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2"
35+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
36+
testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2"
3537
}
3638

3739
test {

Diff for: config/codestyle.xml renamed to codestyle.xml

+199-157
Large diffs are not rendered by default.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: src/main/java/io/library/Library.java renamed to src/main/java/io/goodforgod/template/Library.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package io.library;
1+
package io.goodforgod.template;
2+
23

34
/**
45
* @author GoodforGod

Diff for: src/test/java/io/library/LibraryTests.java renamed to src/test/java/io/goodforgod/template/LibraryTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package io.library;
1+
package io.goodforgod.template;
2+
23

34
/**
45
* @author GoodforGod

Diff for: src/test/resources/logback-test.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<configuration>
2+
<contextName>${BUILD_NUMBER:-1}</contextName>
3+
4+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder>
6+
<charset>UTF-8</charset>
7+
<pattern>%cyan(%d{HH:mm:ss.SSS}) [%cn] %highlight(%-5level) %logger{36} - %msg%n</pattern>
8+
</encoder>
9+
</appender>
10+
11+
<appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
12+
<appender-ref ref="STDOUT"/>
13+
</appender>
14+
15+
<root level="INFO">
16+
<appender-ref ref="ASYNC"/>
17+
</root>
18+
19+
<logger level="DEBUG" name="io.goodforgod.template"/>
20+
</configuration>

0 commit comments

Comments
 (0)