Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Gradle #1261

Merged
merged 1 commit into from Sep 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions build.gradle
Expand Up @@ -14,8 +14,8 @@ plugins {
id "maven-publish"
id "signing"
id "jacoco"
id "io.freefair.lombok" version "5.3.3.3" // 5.3 branch is the last branch compatible with Gradle 6
id "com.diffplug.spotless" version "5.14.3"
id "io.freefair.lombok" version "6.1.0"
id "com.diffplug.spotless" version "5.15.0"
id "net.ltgt.errorprone" version "2.0.2"
id "com.github.kt3k.coveralls" version "2.12.0"
id "biz.aQute.bnd.builder" version "5.3.0"
Expand Down Expand Up @@ -86,8 +86,6 @@ jar {

lombok {
version = "1.18.20"
config['lombok.addLombokGeneratedAnnotation'] = 'true'
config['lombok.getter.noIsPrefix'] = 'true'
}

delombok {
Expand All @@ -107,16 +105,16 @@ test {
}

spotless {
java {
googleJavaFormat("1.7") // 1.7 is the last version that supports Java 8
removeUnusedImports()
}
java {
googleJavaFormat("1.7") // 1.7 is the last version that supports Java 8
removeUnusedImports()
}
}

jacocoTestReport {
reports {
xml.enabled = true // coveralls plugin depends on xml format report
html.enabled = true
xml.required = true // coveralls plugin depends on xml format report
html.required = true
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion lombok.config
@@ -1,4 +1,3 @@
# This file is generated by the 'io.freefair.lombok' Gradle plugin
config.stopBubbling = true
lombok.addLombokGeneratedAnnotation = true
lombok.getter.noIsPrefix = true