Skip to content

Commit df30d32

Browse files
authored
Upgrade gradle (#1261)
1 parent e7fc037 commit df30d32

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

build.gradle

+8-10
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ plugins {
1414
id "maven-publish"
1515
id "signing"
1616
id "jacoco"
17-
id "io.freefair.lombok" version "5.3.3.3" // 5.3 branch is the last branch compatible with Gradle 6
18-
id "com.diffplug.spotless" version "5.14.3"
17+
id "io.freefair.lombok" version "6.1.0"
18+
id "com.diffplug.spotless" version "5.15.0"
1919
id "net.ltgt.errorprone" version "2.0.2"
2020
id "com.github.kt3k.coveralls" version "2.12.0"
2121
id "biz.aQute.bnd.builder" version "5.3.0"
@@ -86,8 +86,6 @@ jar {
8686

8787
lombok {
8888
version = "1.18.20"
89-
config['lombok.addLombokGeneratedAnnotation'] = 'true'
90-
config['lombok.getter.noIsPrefix'] = 'true'
9189
}
9290

9391
delombok {
@@ -107,16 +105,16 @@ test {
107105
}
108106

109107
spotless {
110-
java {
111-
googleJavaFormat("1.7") // 1.7 is the last version that supports Java 8
112-
removeUnusedImports()
113-
}
108+
java {
109+
googleJavaFormat("1.7") // 1.7 is the last version that supports Java 8
110+
removeUnusedImports()
111+
}
114112
}
115113

116114
jacocoTestReport {
117115
reports {
118-
xml.enabled = true // coveralls plugin depends on xml format report
119-
html.enabled = true
116+
xml.required = true // coveralls plugin depends on xml format report
117+
html.required = true
120118
}
121119
}
122120

+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-6.9.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

lombok.config

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# This file is generated by the 'io.freefair.lombok' Gradle plugin
21
config.stopBubbling = true
32
lombok.addLombokGeneratedAnnotation = true
43
lombok.getter.noIsPrefix = true

0 commit comments

Comments
 (0)