Merge pull request #55 from ted-xie:pre-alpha-cleanup-workspace

PiperOrigin-RevId: 495867229 Change-Id: I2b4a8c932b53507b0ff0e935a650faa636e79481
bazelbuild · Dec 16, 2022 · 5f39a71 · 5f39a71
2 parents 0dec591 + 5ce3ffe
commit 5f39a71
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -32,9 +32,11 @@ To use the new Bazel Android rules, add the following to your WORKSPACE file:
   urls = ["https:/bazelbuild/rules_android/archive/refs/heads/pre-alpha.zip"],
   strip_prefix = "rules_android-pre-alpha",
  )
+ load("@build_bazel_rules_android//:prereqs.bzl", "rules_android_prereqs")
+ rules_android_prereqs()
  load("@build_bazel_rules_android//:defs.bzl", "rules_android_workspace")
  rules_android_workspace()
- 
+
  register_toolchains(
   "@build_bazel_rules_android//toolchains/android:android_default_toolchain",
   "@build_bazel_rules_android//toolchains/android_sdk:android_sdk_tools",

diff --git a/WORKSPACE b/WORKSPACE
@@ -3,37 +3,6 @@ workspace(name = "build_bazel_rules_android")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-maybe(
- http_archive,
- name = "remote_java_tools_for_rules_android",
- sha256 = "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3",
- urls = [
- "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip",
- "https:/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip",
- ],
-)
-
-maybe(
- http_archive,
- name = "com_google_protobuf",
- sha256 = "87407cd28e7a9c95d9f61a098a53cf031109d451a7763e7dd1253abf8b4df422",
- strip_prefix = "protobuf-3.19.1",
- urls = ["https:/protocolbuffers/protobuf/archive/v3.19.1.tar.gz"],
-)
-
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-protobuf_deps()
-
-maybe(
- http_archive,
- name = "rules_jvm_external",
- strip_prefix = "rules_jvm_external-fa73b1a8e4846cee88240d0019b8f80d39feb1c3",
- sha256 = "7e13e48b50f9505e8a99cc5a16c557cbe826e9b68d733050cd1e318d69f94bb5",
- url = "https:/bazelbuild/rules_jvm_external/archive/fa73b1a8e4846cee88240d0019b8f80d39feb1c3.zip",
-)
-
-load("defs.bzl", "rules_android_workspace")
-
 maybe(
  android_sdk_repository,
  name = "androidsdk",
@@ -44,68 +13,13 @@ maybe(
  name = "androidndk",
 )
 
-maybe(
- http_archive,
- name = "bazel_skylib",
- sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
- urls = [
- "https:/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
- ],
-)
-register_toolchains("//toolchains/android:all")
-register_toolchains("//toolchains/android_sdk:all")
-register_toolchains("//toolchains/emulator:all")
+load("prereqs.bzl", "rules_android_prereqs")
+rules_android_prereqs()
 
-maybe(
- http_archive,
- name = "io_bazel_rules_go",
- sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
- "https:/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
- ],
-)
-
-maybe(
- http_archive,
- name = "bazel_gazelle",
- sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
- "https:/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
- ],
-)
-
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
-go_rules_dependencies()
-
-go_register_toolchains(version = "1.18.3")
-
-gazelle_dependencies()
-# gazelle:repository go_repository name=org_golang_x_xerrors importpath=golang.org/x/xerrors
-
-go_repository(
- name = "org_golang_google_protobuf",
- importpath = "google.golang.org/protobuf",
- sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
- version = "v1.28.1",
-)
-
-go_repository(
- name = "com_github_google_go_cmp",
- importpath = "github.com/google/go-cmp",
- sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
- version = "v0.5.9",
-)
-
-go_repository(
- name = "org_golang_x_sync",
- importpath = "golang.org/x/sync",
- sum = "h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=",
- version = "v0.0.0-20210220032951-036812b2e83c",
-)
+load("defs.bzl", "rules_android_workspace")
 
 rules_android_workspace()
 
+register_toolchains("//toolchains/android:all")
+register_toolchains("//toolchains/android_sdk:all")
+register_toolchains("//toolchains/emulator:all")
diff --git a/defs.bzl b/defs.bzl
@@ -14,10 +14,14 @@
 
 """Workspace setup macro for rules_android."""
 
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 def rules_android_workspace():
  """ Sets up workspace dependencies for rules_android."""
+ protobuf_deps()
 
  maven_install(
  name = "rules_android_maven",
@@ -29,3 +33,33 @@ def rules_android_workspace():
  "https://repo1.maven.org/maven2",
  ],
  )
+
+ go_rules_dependencies()
+
+ go_register_toolchains(version = "1.18.3")
+
+ gazelle_dependencies()
+ # gazelle:repository go_repository name=org_golang_x_xerrors importpath=golang.org/x/xerrors
+
+ go_repository(
+ name = "org_golang_google_protobuf",
+ importpath = "google.golang.org/protobuf",
+ sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
+ version = "v1.28.1",
+ )
+
+ go_repository(
+ name = "com_github_google_go_cmp",
+ importpath = "github.com/google/go-cmp",
+ sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
+ version = "v0.5.9",
+ )
+
+ go_repository(
+ name = "org_golang_x_sync",
+ importpath = "golang.org/x/sync",
+ sum = "h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=",
+ version = "v0.0.0-20210220032951-036812b2e83c",
+ )
+
+
diff --git a/examples/basicapp/WORKSPACE b/examples/basicapp/WORKSPACE
@@ -33,6 +33,8 @@ local_repository(
  name = "rules_android",
  path = "../..", # rules_android's WORKSPACE relative to this inner workspace
 )
+load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
+rules_android_prereqs()
 load("@rules_android//:defs.bzl", "rules_android_workspace")
 rules_android_workspace()
 register_toolchains(

diff --git a/prereqs.bzl b/prereqs.bzl
@@ -0,0 +1,79 @@
+# Copyright 2022 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Sets up prerequisites for rules_android."""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+
+def rules_android_prereqs():
+ """Downloads prerequisite repositories for rules_android."""
+ maybe(
+ http_archive,
+ name = "rules_jvm_external",
+ strip_prefix = "rules_jvm_external-fa73b1a8e4846cee88240d0019b8f80d39feb1c3",
+ sha256 = "7e13e48b50f9505e8a99cc5a16c557cbe826e9b68d733050cd1e318d69f94bb5",
+ url = "https:/bazelbuild/rules_jvm_external/archive/fa73b1a8e4846cee88240d0019b8f80d39feb1c3.zip",
+ )
+
+ maybe(
+ http_archive,
+ name = "com_google_protobuf",
+ sha256 = "87407cd28e7a9c95d9f61a098a53cf031109d451a7763e7dd1253abf8b4df422",
+ strip_prefix = "protobuf-3.19.1",
+ urls = ["https:/protocolbuffers/protobuf/archive/v3.19.1.tar.gz"],
+ )
+
+ maybe(
+ http_archive,
+ name = "remote_java_tools_for_rules_android",
+ sha256 = "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3",
+ urls = [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip",
+ "https:/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip",
+ ],
+ )
+
+ maybe(
+ http_archive,
+ name = "bazel_skylib",
+ sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
+ urls = [
+ "https:/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+ ],
+ )
+
+ maybe(
+ http_archive,
+ name = "io_bazel_rules_go",
+ sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
+ urls = [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
+ "https:/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
+ ],
+ )
+
+ maybe(
+ http_archive,
+ name = "bazel_gazelle",
+ sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
+ urls = [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
+ "https:/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
+ ],
+ )
+
+