diff options
| author |  Googler <noreply@google.com> | 2017-08-31 16:29:34 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-08-31 18:28:30 +0200 |
| commit | 5b90b169f8ea5f6d99a540d82304b9b7dbfd5b02 (patch) | |
| tree | 5ea14b47522fe6044798c1e0ea178fa29f11f936 | |
| parent | 9273eac31096574a839cbef2576e6ebeaccef002 (diff) | |
Moves the bazel_j2objc repository definition from j2objc.WORKSPACE to the main
WORKSPACE file, removing j2objc.WORKSPACE.
Updates J2ObjC version to 2.0.3, which has its own BUILD file.
RELNOTES: J2ObjC version updated to 2.0.3.
PiperOrigin-RevId: 167135399
3 files changed, 7 insertions, 16 deletions
@@ -33,6 +33,13 @@ bind( actual = "//third_party/py/six", ) +http_archive( + name = "bazel_j2objc", + url = "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip", + sha256 = "529ee99e6f0e3f88edef61aeae4f13dc6e5eb8183993ced191338422b0e1fbeb", + strip_prefix = "j2objc-2.0.3", +) + # For src/test/docker/... load("//src/test/docker:docker_repository.bzl", "docker_repository") docker_repository() diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index f116388b6c..3805c8b0db 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -615,14 +615,6 @@ public class BazelRuleClassProvider { builder.addNativeAspectClass(j2ObjcAspect); builder.addRuleDefinition(new J2ObjcLibraryBaseRule()); builder.addRuleDefinition(new J2ObjcLibraryRule(j2ObjcAspect)); - - try { - builder.addWorkspaceFilePrefix( - ResourceFileLoader.loadResource( - BazelRuleClassProvider.class, "objc/j2objc.WORKSPACE")); - } catch (IOException e) { - throw new IllegalStateException(e); - } } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE deleted file mode 100644 index a2c860696c..0000000000 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE +++ /dev/null @@ -1,8 +0,0 @@ -# External dependencies for the java_* rules. - -new_http_archive( - name = "bazel_j2objc", - url = "https://github.com/google/j2objc/releases/download/1.0.1/j2objc-1.0.1.zip", - sha256 = "25cd1da1c2ca2f446bcd9e663da1e1776316547f4b14785709d07ce888c34d67", - build_file = __embedded_dir__ + "/embedded_tools/third_party/java/j2objc/BUILD.remote" -) |