Skip to content

Commit 4eb71bd

Browse files
committed
Update nullaway
1 parent a1704da commit 4eb71bd

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ maven.install(
180180
"com.google.googlejavaformat:google-java-format:jar:1.23.0",
181181
"com.graphql-java:graphql-java:20.2",
182182
"com.graphql-java:java-dataloader:3.2.0",
183-
"com.uber.nullaway:nullaway:0.11.2",
183+
"com.uber.nullaway:nullaway:0.11.3",
184184
"dev.failsafe:failsafe:3.3.2",
185185
"io.grpc:grpc-context:1.66.0",
186186
"io.lettuce:lettuce-core:6.4.0.RELEASE",

java/BUILD.bazel

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
12
load("@contrib_rules_jvm//java:defs.bzl", "spotbugs_config")
23
load(":defs.bzl", "artifact")
3-
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
44

55
exports_files(
66
srcs = [
@@ -29,7 +29,7 @@ java_plugin(
2929
],
3030
deps = [
3131
artifact("com.uber.nullaway:nullaway"),
32-
]
32+
],
3333
)
3434

3535
java_library(
@@ -57,8 +57,12 @@ spotbugs_config(
5757

5858
string_flag(
5959
name = "nullaway_level",
60-
values = ["NONE", "WARN", "ERROR"],
6160
build_setting_default = "NONE",
61+
values = [
62+
"NONE",
63+
"WARN",
64+
"ERROR",
65+
],
6266
)
6367

6468
config_setting(

java/maven_install.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 811715158,
4-
"__RESOLVED_ARTIFACTS_HASH": -1728330386,
3+
"__INPUT_ARTIFACTS_HASH": 1792396849,
4+
"__RESOLVED_ARTIFACTS_HASH": 1206533551,
55
"conflict_resolution": {
66
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
77
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
@@ -208,10 +208,10 @@
208208
},
209209
"com.uber.nullaway:nullaway": {
210210
"shasums": {
211-
"jar": "7a1e6747500c90b005ae57670af6e3e9213f141e3321bae3fec82ca60e04b49a",
212-
"sources": "b3ecb5ad95fa9f18df754e8d6c09edf743de0a01773b103b56ee5f8cc3bcebf6"
211+
"jar": "daac4247daf18024c236a4f9bae99a145bca044037ca8d805e00dc1b76270b31",
212+
"sources": "e76ad83c1796291c5c2c9cb6c35bd06eebe51735319f06b27992cea5edd50999"
213213
},
214-
"version": "0.11.2"
214+
"version": "0.11.3"
215215
},
216216
"commons-codec:commons-codec": {
217217
"shasums": {

java/private/java_library.bzl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load(
22
"@contrib_rules_jvm//java:defs.bzl",
3-
_java_library = "java_library"
3+
_java_library = "java_library",
44
)
55

66
def java_library(
@@ -13,27 +13,26 @@ def java_library(
1313
javacopts = [],
1414
plugins = [],
1515
**kwargs):
16-
1716
# NullAway configuration
1817
nullaway_plugins = select({
1918
"//java:use_nullaway_level_warn": [
20-
"//java:nullaway"
19+
"//java:nullaway",
2120
],
2221
"//java:use_nullaway_level_error": [
23-
"//java:nullaway"
22+
"//java:nullaway",
2423
],
2524
"//conditions:default": [],
2625
})
2726
nullaway_javacopts = select({
2827
"//java:use_nullaway_level_warn": [
29-
'-Xep:NullAway:WARN',
30-
'-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium',
31-
'-XepOpt:NullAway:JSpecifyMode=true'
28+
"-Xep:NullAway:WARN",
29+
"-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium",
30+
"-XepOpt:NullAway:JSpecifyMode=true",
3231
],
3332
"//java:use_nullaway_level_error": [
34-
'-Xep:NullAway:ERROR',
35-
'-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium',
36-
'-XepOpt:NullAway:JSpecifyMode=true'
33+
"-Xep:NullAway:ERROR",
34+
"-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium",
35+
"-XepOpt:NullAway:JSpecifyMode=true",
3736
],
3837
"//conditions:default": [],
3938
})

0 commit comments

Comments
 (0)