Skip to content

Commit 8470be1

Browse files
cushondamienmg
cushon
authored and
damienmg
committed
Clean up javac and Error Prone targets
now that the upgrade is complete. The targets with suffixes were added to make a two-step migration possible. Now that the migration is done the suffix-less targets can provide the new versions, and the suffixed targets can be directed to the un-suffixed targets until they are removed. Change-Id: I5632b14924df6a83a23e3f564d483f4925f72d08
1 parent 148366f commit 8470be1

File tree

5 files changed

+27
-64
lines changed

5 files changed

+27
-64
lines changed

‎third_party/BUILD‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -333,32 +333,19 @@ java_import(
333333
],
334334
)
335335

336-
java_import(
336+
# TODO(cushon): delete
337+
alias(
337338
name = "error_prone-2.0.20-SNAPSHOT",
338-
jars = [
339-
"error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar",
340-
"error_prone/error_prone_core-2.0.20-SNAPSHOT.jar",
341-
"error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar",
342-
"error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar",
343-
],
344-
exports = [
345-
":auto_common",
346-
":guava",
347-
":jcip_annotations",
348-
":jsr305",
349-
":pcollections",
350-
"//third_party/checker_framework_dataflow",
351-
"//third_party/jformatstring",
352-
],
339+
actual = ":error_prone",
353340
)
354341

355342
java_import(
356343
name = "error_prone",
357344
jars = [
358-
"error_prone/error_prone_check_api-2.0.19.jar",
359-
"error_prone/error_prone_core-2.0.19.jar",
360-
"error_prone/error_prone_annotations-2.0.19.jar",
361-
"error_prone/error_prone_annotation-2.0.19.jar",
345+
"error_prone/error_prone_check_api-2.0.20-SNAPSHOT.jar",
346+
"error_prone/error_prone_core-2.0.20-SNAPSHOT.jar",
347+
"error_prone/error_prone_annotations-2.0.20-SNAPSHOT.jar",
348+
"error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar",
362349
],
363350
exports = [
364351
":auto_common",
@@ -394,7 +381,7 @@ java_import(
394381

395382
# For bootstrapping JavaBuilder
396383
filegroup(
397-
name = "bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
384+
name = "bootstrap_guava_and_error_prone-jars",
398385
srcs = [
399386
"auto/auto-common-0.3.jar",
400387
"error_prone/error_prone_annotation-2.0.20-SNAPSHOT.jar",
@@ -410,21 +397,10 @@ filegroup(
410397
],
411398
)
412399

413-
filegroup(
414-
name = "bootstrap_guava_and_error_prone-jars",
415-
srcs = [
416-
"auto/auto-common-0.3.jar",
417-
"error_prone/error_prone_annotation-2.0.19.jar",
418-
"error_prone/error_prone_annotations-2.0.19.jar",
419-
"error_prone/error_prone_check_api-2.0.19.jar",
420-
"error_prone/error_prone_core-2.0.19.jar",
421-
"guava/guava-21.0.jar",
422-
"jcip_annotations/jcip-annotations-1.0-1.jar",
423-
"jsr305/jsr-305.jar",
424-
"pcollections/pcollections-2.1.2.jar",
425-
"//third_party/checker_framework_dataflow:bootstrap",
426-
"//third_party/jformatstring:bootstrap",
427-
],
400+
# TODO(cushon): delete
401+
alias(
402+
name = "bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
403+
actual = "bootstrap_guava_and_error_prone-jars",
428404
)
429405

430406
# As of Guava 20.0, Guava code uses Error Prone annotations. This isn't a

‎third_party/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ a minimal set of extra dependencies.
9797

9898
## [Error Prone](https://github.com/google/error-prone)
9999

100-
* Version: 2.0.19, 2.0.20-SNAPSHOT
100+
* Version: 2.0.20-SNAPSHOT
101101
* License: Apache License 2.0
102102

103103

@@ -166,7 +166,7 @@ a minimal set of extra dependencies.
166166

167167
## [javac](https://github.com/google/error-prone-javac)
168168

169-
* Version: 9-dev-r3297-4 (javac-9-dev-r3297-4.jar), 9-dev-r4023-1 (javac-9-dev-r4023-1.jar)
169+
* Version: 9-dev-r4023-1 (javac-9-dev-r4023-1.jar)
170170
* License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
171171

172172
## [jarjar](https://code.google.com/p/jarjar/)

‎third_party/java/jdk/langtools/BUILD‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,54 +19,41 @@ filegroup(
1919
"//conditions:default": [
2020
"BUILD",
2121
"LICENSE",
22-
"javac-9-dev-r3297-4.jar",
23-
"javac-9-dev-r3297-4.srcjar",
22+
"javac-9-dev-r4023-1.jar",
23+
"javac-9-dev-r4023-1.srcjar",
2424
],
2525
}),
2626
)
2727

2828
java_import(
2929
name = "javac",
30-
jars = ["javac-9-dev-r3297-4.jar"],
30+
jars = ["javac-9-dev-r4023-1.jar"],
3131
)
3232

3333
filegroup(
3434
name = "javac_jar",
3535
srcs = select({
3636
"//tools/jdk:jdk7": ["javac7.jar"],
37-
"//conditions:default": ["javac-9-dev-r3297-4.jar"],
37+
"//conditions:default": ["javac-9-dev-r4023-1.jar"],
3838
}),
3939
)
4040

41-
filegroup(
41+
# TODO(cushon): delete
42+
alias(
4243
name = "test-srcs-9-dev-r4023-1",
43-
srcs = select({
44-
"//tools/jdk:jdk7": [
45-
"BUILD",
46-
"LICENSE",
47-
"javac7.jar",
48-
"javac7.srcjar",
49-
],
50-
"//conditions:default": [
51-
"BUILD",
52-
"LICENSE",
53-
"javac-9-dev-r4023-1.jar",
54-
"javac-9-dev-r4023-1.srcjar",
55-
],
56-
}),
44+
actual = ":test-srcs",
5745
)
5846

59-
java_import(
47+
# TODO(cushon): delete
48+
alias(
6049
name = "javac-9-dev-r4023-1",
61-
jars = ["javac-9-dev-r4023-1.jar"],
50+
actual = ":javac",
6251
)
6352

64-
filegroup(
53+
# TODO(cushon): delete
54+
alias(
6555
name = "javac_jar-9-dev-r4023-1",
66-
srcs = select({
67-
"//tools/jdk:jdk7": ["javac7.jar"],
68-
"//conditions:default": ["javac-9-dev-r4023-1.jar"],
69-
}),
56+
actual = ":javac_jar",
7057
)
7158

7259
java_import(

‎third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar‎

-3.97 MB
Binary file not shown.

‎third_party/java/jdk/langtools/javac-9-dev-r3297-4.srcjar‎

-3.52 MB
Binary file not shown.

0 commit comments

Comments
 (0)