Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Update javac version to 9-dev-r4023-2
Browse files Browse the repository at this point in the history
Fixes bazelbuild#2979

Change-Id: I23e38767e18a90b2262a38bf8f4b347e06d1de8d
  • Loading branch information
cushon authored and kchodorow committed May 10, 2017
1 parent a0fd766 commit 36ce4b4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion third_party/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ a minimal set of extra dependencies.

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

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

## [jarjar](https://code.google.com/p/jarjar/)
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/jdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version of the JRE. Those builds are vendored in
//third_party/java/jdk/langtools.

Currently Bazel supports running on a JRE 8 only because the default Java
compiler used (//third_party/java/jdk/langtools/javac-9-dev-r3297-4.jar) is the
compiler used (//third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar) is the
Java compiler of OpenJDK 9 compiled to run on a JRE 8. This cannot
be built to run on a JRE 7 because of code incompatibility. Bazel's
JavaBuilder at HEAD cannot be linked with earlier version of the
Expand Down
14 changes: 7 additions & 7 deletions third_party/java/jdk/langtools/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@ filegroup(
"//conditions:default": [
"BUILD",
"LICENSE",
"javac-9-dev-r4023-1.jar",
"javac-9-dev-r4023-1.srcjar",
"javac-9-dev-r4023-2.jar",
"javac-9-dev-r4023-2.srcjar",
],
}),
)

java_import(
name = "javac",
jars = ["javac-9-dev-r4023-1.jar"],
jars = ["javac-9-dev-r4023-2.jar"],
)

filegroup(
name = "javac_jar",
srcs = select({
"//tools/jdk:jdk7": ["javac7.jar"],
"//conditions:default": ["javac-9-dev-r4023-1.jar"],
"//conditions:default": ["javac-9-dev-r4023-2.jar"],
}),
)

# TODO(cushon): delete
alias(
name = "test-srcs-9-dev-r4023-1",
name = "test-srcs-9-dev-r4023-2",
actual = ":test-srcs",
)

# TODO(cushon): delete
alias(
name = "javac-9-dev-r4023-1",
name = "javac-9-dev-r4023-2",
actual = ":javac",
)

# TODO(cushon): delete
alias(
name = "javac_jar-9-dev-r4023-1",
name = "javac_jar-9-dev-r4023-2",
actual = ":javac_jar",
)

Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit 36ce4b4

Please sign in to comment.