Skip to content

Commit

Permalink
Version and style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wmdietl committed Jan 7, 2025
1 parent 00e8066 commit 23bf8ff
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
// Code formatting; defines targets "spotlessApply" and "spotlessCheck".
// https://github.com/diffplug/spotless/tags ; see tags starting "gradle/"
// Only works on JDK 11+.
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:7.0.1'
}
}
}
Expand All @@ -16,10 +16,10 @@ plugins {
id 'com.gradleup.shadow' version '8.3.5'

// Error Prone linter
id('net.ltgt.errorprone') version '4.1.0'
id 'net.ltgt.errorprone' version '4.1.0'

// Checker Framework pluggable type-checking
id 'org.checkerframework' version '0.6.45'
id 'org.checkerframework' version '0.6.48' apply false
}

repositories {
Expand Down Expand Up @@ -74,7 +74,7 @@ if (isJava11orHigher) {

// define the steps to apply to those files
trimTrailingWhitespace()
indentWithSpaces(2)
leadingTabsToSpaces(2)
endWithNewline()
}
java {
Expand All @@ -85,7 +85,7 @@ if (isJava11orHigher) {
groovyGradle {
target '**/*.gradle'
greclipse() // which formatter Spotless should use to format .gradle files.
indentWithSpaces(2)
leadingTabsToSpaces(2)
trimTrailingWhitespace()
// endWithNewline() // Don't want to end empty files with a newline
}
Expand All @@ -103,7 +103,6 @@ tasks.withType(JavaCompile).configureEach {
// "-processing" avoids javac warning "No processor claimed any of these annotations".
// "-classfile" is because of classgraph and https://bugs.openjdk.java.net/browse/JDK-8190452
options.compilerArgs << '-Xlint:all,-processing,-classfile' << '-Werror'
options.errorprone.enabled = isJava11orHigher
options.errorprone {
disable('ExtendsObject') // Incorrect when using the Checker Framework
disable('ReferenceEquality') // Use Interning Checker instead.
Expand Down Expand Up @@ -133,6 +132,7 @@ if (true) {
dependencies {
compileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
testCompileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
checkerFramework "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
checkerFramework "io.github.eisop:checker:${checkerFrameworkVersion}"
}

Expand Down

0 comments on commit 23bf8ff

Please sign in to comment.