Skip to content

Commit 2ff5690

Browse files
committed
Upgrade JSpecify and nullness checking tooling
1 parent 4159838 commit 2ff5690

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ plugins {
2828
id "groovy"
2929
id "me.champeau.jmh" version "0.7.3"
3030
id "io.github.reyerizo.gradle.jcstress" version "0.9.0"
31-
id "net.ltgt.errorprone" version '5.1.1'
31+
id "net.ltgt.errorprone" version '5.2.0'
3232
id 'jacoco'
3333
//
3434
// Kotlin just for tests - not production code
35-
id 'org.jetbrains.kotlin.jvm' version '2.4.20'
35+
id 'org.jetbrains.kotlin.jvm' version '2.4.21'
3636
}
3737

3838
java {
@@ -234,7 +234,7 @@ shadow {
234234
dependencies {
235235
api 'com.graphql-java:java-dataloader:6.0.0'
236236
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
237-
api "org.jspecify:jspecify:1.0.0"
237+
api "org.jspecify:jspecify:1.0.1"
238238

239239
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
240240
implementation 'com.google.guava:guava:' + guavaVersion
@@ -273,8 +273,8 @@ dependencies {
273273
// comment this in if you want to run JMH benchmarks from idea
274274
// jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
275275

276-
errorprone 'com.uber.nullaway:nullaway:0.13.8'
277-
errorprone 'com.google.errorprone:error_prone_core:2.50.0'
276+
errorprone 'com.uber.nullaway:nullaway:0.14.3'
277+
errorprone 'com.google.errorprone:error_prone_core:2.52.0'
278278

279279
// just tests - no Kotlin otherwise
280280
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'

‎src/main/java/graphql/execution/instrumentation/ChainedInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private static ChainedInstrumentationState asChainedState(@Nullable Instrumentat
7676
return (ChainedInstrumentationState) assertNotNull(state);
7777
}
7878

79-
private <T> @Nullable InstrumentationContext<T> chainedCtx(@Nullable InstrumentationState state, BiFunction<Instrumentation, @Nullable InstrumentationState, InstrumentationContext<T>> mapper) {
79+
private <T> @Nullable InstrumentationContext<T> chainedCtx(@Nullable InstrumentationState state, BiFunction<Instrumentation, @Nullable InstrumentationState, @Nullable InstrumentationContext<T>> mapper) {
8080
// if we have zero or 1 instrumentations (and 1 is the most common), then we can avoid an object allocation
8181
// of the ChainedInstrumentationContext since it won't be needed
8282
if (instrumentations.isEmpty()) {

‎src/test/groovy/graphql/archunit/JSpecifyConsumerContractsTest.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class JSpecifyConsumerContractsTest extends Specification {
4141
result.output.contains('getNewAccumulate')
4242
}
4343

44-
// NullAway 0.13 does not model all JDK collection and callback generic uses.
4544
// Check the published type-use annotations as well as consumer compilation.
4645
def "mapper accepts and returns nullable values"() {
4746
when:

0 commit comments

Comments
 (0)