Skip to content

Commit 9361a1b

Browse files
committed
Upgrade CheckerFramework and execute with ciCheck task or -PskipCheckerFramework=false
1 parent 38b2d8c commit 9361a1b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
id 'biz.aQute.bnd' version '7.1.0' apply false
2525

2626
id "com.diffplug.spotless" version "7.0.4"
27-
id 'org.checkerframework' version '0.6.55'
27+
id 'org.checkerframework' version '0.6.56'
2828
id 'org.hibernate.orm.build.jdks'
2929

3030
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'

local-build-plugins/src/main/groovy/local.code-quality.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,15 @@ spotless {
105105

106106
tasks.compileJava.dependsOn tasks.spotlessJavaApply
107107

108+
dependencies {
109+
compileOnly libs.checkerFramework
110+
testCompileOnly libs.checkerFramework
111+
checkerFramework libs.checkerFrameworkChecker
112+
}
113+
108114
checkerFramework {
109115
excludeTests = true
110-
skipCheckerFramework = true
116+
skipCheckerFramework = !gradle.startParameter.taskNames.contains("ciCheck")
111117
checkers = [
112118
'org.checkerframework.checker.nullness.NullnessChecker'
113119
]

settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ dependencyResolutionManagement {
7777
// WARNING: When upgrading to a version of bytebuddy that supports a new bytecode version,
7878
// make sure to remove the now unnecessary net.bytebuddy.experimental=true in relevant CI jobs (Jenkinsfile).
7979
def byteBuddyVersion = version "byteBuddy", "1.17.6"
80+
def checkerFrameworkVersion = version "checkerFramework", "3.49.5"
8081
def classmateVersion = version "classmate", "1.7.0"
8182
def geolatteVersion = version "geolatte", "1.10"
8283
def hibernateModelsVersion = version "hibernateModels", "1.0.1"
@@ -102,6 +103,9 @@ dependencyResolutionManagement {
102103
library( "byteBuddy", "net.bytebuddy", "byte-buddy" ).versionRef( byteBuddyVersion )
103104
library( "byteBuddyAgent", "net.bytebuddy", "byte-buddy-agent" ).versionRef( byteBuddyVersion )
104105

106+
library( "checkerFramework", "org.checkerframework", "checker-qual" ).versionRef( checkerFrameworkVersion )
107+
library( "checkerFrameworkChecker", "org.checkerframework", "checker" ).versionRef( checkerFrameworkVersion )
108+
105109
library( "logging", "org.jboss.logging", "jboss-logging" ).versionRef( jbossLoggingVersion )
106110
library( "loggingAnnotations", "org.jboss.logging", "jboss-logging-annotations" ).versionRef( jbossLoggingToolVersion )
107111
library( "loggingProcessor", "org.jboss.logging", "jboss-logging-processor" ).versionRef( jbossLoggingToolVersion )

0 commit comments

Comments
 (0)