Skip to content

Commit

Permalink
Bump error prone version to 2.3.5-SNAPSHOT
Browse files Browse the repository at this point in the history
Fixes: bazelbuild#11272.

This change updates error prone to 2.3.5 SNAPSHOT and includes demotion
of breaking changes to warning severity: ExtendsAutoValue and
RefersToDaggerCodegen. Given that Bazel EP integration does not activate
warning checks, this upgrade is backwards compatible and must not be
protected with new --incompatible_use_error_prone_2.3.5_version option.

Additional library is needed: threeten-extra-1.5.0.

Also bump guava version to 27.1-jre and add transitive dependency
failureaccess-1.0.1.
  • Loading branch information
davido committed May 27, 2020
1 parent 9734be0 commit 2f2f25b
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 13 deletions.
36 changes: 26 additions & 10 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -321,20 +321,27 @@ java_import(
srcjar = "hungarian_algorithm/software-and-algorithms-1.0-src.jar",
)

java_import(
name = "threeten",
jars = [
"error_prone/threeten-extra-1.5.0.jar",
],
)

java_import(
name = "error_prone_annotations",
jars = [
"error_prone/error_prone_annotations-2.3.4.jar",
"error_prone/error_prone_type_annotations-2.3.4.jar",
"error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar",
"error_prone/error_prone_type_annotations-2.3.5-SNAPSHOT.jar",
],
)

java_import(
name = "error_prone",
jars = [
"error_prone/error_prone_annotation-2.3.4.jar",
"error_prone/error_prone_check_api-2.3.4.jar",
"error_prone/error_prone_core-2.3.4.jar",
"error_prone/error_prone_annotation-2.3.5-SNAPSHOT.jar",
"error_prone/error_prone_check_api-2.3.5-SNAPSHOT.jar",
"error_prone/error_prone_core-2.3.5-SNAPSHOT.jar",
],
exports = [
":error_prone_annotations",
Expand All @@ -347,6 +354,7 @@ java_import(
":jcip_annotations",
":jsr305",
":pcollections",
":threeten",
"//third_party/checker_framework_dataflow",
"//third_party/jformatstring",
],
Expand Down Expand Up @@ -377,18 +385,21 @@ java_import(
filegroup(
name = "bootstrap_guava_and_error_prone-jars",
srcs = [
"error_prone/error_prone_annotations-2.3.4.jar",
"guava/guava-25.1-jre.jar",
"error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar",
"error_prone/threeten-extra-1.5.0.jar",
"guava/failureaccess-1.0.1.jar",
"guava/guava-27.0.1-jre.jar",
"jcip_annotations/jcip-annotations-1.0-1.jar",
"jsr305/jsr-305.jar",
],
)

java_import(
name = "guava",
jars = ["guava/guava-25.1-jre.jar"],
jars = ["guava/guava-27.0.1-jre.jar"],
exports = [
":error_prone_annotations",
":failureaccess",
":jcip_annotations",
":jsr305",
],
Expand Down Expand Up @@ -430,7 +441,7 @@ java_import(
# For bootstrapping JavaBuilder
filegroup(
name = "guava-jars",
srcs = ["guava/guava-25.1-jre.jar"],
srcs = ["guava/guava-27.0.1-jre.jar"],
)

# javax.annotation.Generated is not included in the default root modules in 9,
Expand All @@ -452,6 +463,11 @@ java_import(
jars = ["jsr305/jsr-305.jar"],
)

java_import(
name = "failureaccess",
jars = ["guava/failureaccess-1.0.1.jar"],
)

# For bootstrapping JavaBuilder
filegroup(
name = "jsr305-jars",
Expand Down Expand Up @@ -524,7 +540,7 @@ java_import(

java_import(
name = "guava-testlib",
jars = ["guava/guava-testlib-25.1-jre.jar"],
jars = ["guava/guava-testlib-27.1-jre.jar"],
)

java_import(
Expand Down
6 changes: 3 additions & 3 deletions third_party/checker_framework_dataflow/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ filegroup(

java_import(
name = "checker_framework_dataflow",
jars = ["dataflow-3.2.0.jar"],
srcjar = "dataflow-3.2.0-sources.jar",
jars = ["dataflow-shaded-3.1.2.jar"],
srcjar = "dataflow-shaded-3.1.2-sources.jar",
deps = [
"//third_party/checker_framework_javacutil",
],
)

filegroup(
name = "bootstrap",
srcs = ["dataflow-3.2.0.jar"],
srcs = ["dataflow-shaded-3.1.2.jar"],
)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed third_party/error_prone/error_prone_core-2.3.4.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added third_party/error_prone/threeten-extra-1.5.0.jar
Binary file not shown.
Binary file added third_party/guava/failureaccess-1.0.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 2f2f25b

Please sign in to comment.