Skip to content

Commit 2b806cd

Browse files
committed
update to gradle 9.0.0
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent 6650052 commit 2b806cd

File tree

7 files changed

+57
-59
lines changed

7 files changed

+57
-59
lines changed

buildSrc/src/main/kotlin/check.gradle.kts

Lines changed: 50 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,70 @@ plugins {
88
id("jacoco-report-aggregation") apply false
99
}
1010

11-
subprojects {
12-
if (!plugins.hasPlugin("java")) return@subprojects // only apply to projects have java plugin
11+
apply(plugin = "checkstyle")
12+
apply(plugin = "pmd")
13+
apply(plugin = "com.github.spotbugs")
14+
apply(plugin = "jacoco")
15+
apply(plugin = "jacoco-report-aggregation")
1316

14-
apply(plugin = "checkstyle")
15-
apply(plugin = "pmd")
16-
apply(plugin = "com.github.spotbugs")
17-
apply(plugin = "jacoco")
18-
apply(plugin = "jacoco-report-aggregation")
19-
20-
checkstyle {
21-
dependencies {
22-
checkstyle("com.puppycrawl.tools:checkstyle:10.26.1")
23-
checkstyle("com.github.sevntu-checkstyle:sevntu-checks:1.44.1")
24-
}
17+
checkstyle {
18+
dependencies {
19+
checkstyle("com.puppycrawl.tools:checkstyle:10.26.1")
20+
checkstyle("com.github.sevntu-checkstyle:sevntu-checks:1.44.1")
21+
}
2522

26-
configFile = rootProject.file("buildSrc/src/main/check/checkstyle.xml")
27-
configProperties["configDir"] = configFile.parentFile
23+
configFile = rootProject.file("buildSrc/src/main/check/checkstyle.xml")
24+
configProperties["configDir"] = configFile.parentFile
2825

29-
tasks.named<Checkstyle>("checkstyleMain") {
30-
group = "verification"
31-
source = fileTree(projectDir) {
32-
include("conf/**/*.properties")
33-
include("src/main/java/**/*.java")
34-
include("src/main/**/*.properties")
35-
}
26+
tasks.named<Checkstyle>("checkstyleMain") {
27+
group = "verification"
28+
source = fileTree(projectDir) {
29+
include("conf/**/*.properties")
30+
include("src/main/java/**/*.java")
31+
include("src/main/**/*.properties")
3632
}
33+
}
3734

38-
tasks.named<Checkstyle>("checkstyleTest").configure {
39-
group = "verification"
40-
source = fileTree(projectDir) {
41-
include("src/test/java/**/*.java") // not include java files in resources
42-
include("src/test/**/*.properties")
43-
}
35+
tasks.named<Checkstyle>("checkstyleTest").configure {
36+
group = "verification"
37+
source = fileTree(projectDir) {
38+
include("src/test/java/**/*.java") // not include java files in resources
39+
include("src/test/**/*.properties")
4440
}
4541
}
42+
}
4643

47-
pmd {
48-
ruleSets = listOf()
49-
ruleSetFiles = rootProject.files("buildSrc/src/main/check/pmd.xml")
50-
toolVersion = "7.16.0"
51-
isConsoleOutput = true
44+
pmd {
45+
ruleSets = listOf()
46+
ruleSetFiles = rootProject.files("buildSrc/src/main/check/pmd.xml")
47+
toolVersion = "7.16.0"
48+
isConsoleOutput = true
5249

53-
tasks.withType<Pmd> {
54-
group = "verification"
55-
}
50+
tasks.withType<Pmd> {
51+
group = "verification"
5652
}
53+
}
5754

58-
spotbugs {
59-
dependencies {
60-
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.12")
61-
}
62-
63-
toolVersion = "4.9.3"
64-
reportLevel = Confidence.LOW
65-
extraArgs = listOf("-longBugCodes")
66-
includeFilter = rootProject.file("buildSrc/src/main/check/spotbugs.xml")
55+
spotbugs {
56+
dependencies {
57+
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.12")
6758
}
6859

69-
jacoco {
70-
toolVersion = "0.8.13"
60+
toolVersion = "4.9.3"
61+
reportLevel = Confidence.LOW
62+
extraArgs = listOf("-longBugCodes")
63+
includeFilter = rootProject.file("buildSrc/src/main/check/spotbugs.xml")
64+
}
65+
66+
jacoco {
67+
toolVersion = "0.8.13"
7168

72-
tasks.named<JacocoReport>("testCodeCoverageReport") {
73-
reports {
74-
xml.required = true
75-
xml.outputLocation = layout.buildDirectory.file("reports/jacoco/report.xml").get()
76-
html.required = true
77-
csv.required = false
78-
}
69+
tasks.named<JacocoReport>("testCodeCoverageReport") {
70+
reports {
71+
xml.required = true
72+
xml.outputLocation = layout.buildDirectory.file("reports/jacoco/report.xml").get()
73+
html.required = true
74+
csv.required = false
7975
}
8076
}
8177
}

buildSrc/src/main/kotlin/project.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ subprojects {
7575
}
7676
}
7777
}
78-
}
7978

80-
apply(plugin = "check")
79+
apply(plugin = "check")
80+
}
8181

8282
allprojects {
8383
apply(plugin = "idea")

core-ng/src/main/java/core/framework/internal/db/DatabaseOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private long[] fetchGeneratedKeys(PreparedStatement statement, int size) throws
207207
return results;
208208
}
209209

210-
private void setParams(PreparedStatement statement, Object @Nullable ... params) throws SQLException {
210+
private void setParams(PreparedStatement statement, Object... params) throws SQLException {
211211
if (params != null) {
212212
for (int i = 0; i < params.length; i++) {
213213
setParam(statement, i + 1, params[i]);

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
org.gradle.caching=true
2+
org.gradle.configuration-cache=true
3+
org.gradle.configuration-cache.parallel=true
24
org.gradle.warning.mode=all

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)