Merge branch 'bazelbuild:main' into debuggable_manifest

Author: EdbertChan

.bazelci/presubmit.yml

@@ -1,13 +1,17 @@
----
-
-bazel: last_green
+matrix:
+  bazel: [
+    7.4.1,
+    # last_green, # Enable this once WORKSPACE builds with Bazel 8 work.
+  ]
 
 tools_flags: &tools_flags
   ? "--enable_bzlmod=false"
+  ? "--enable_workspace=true"
   # Sandboxed SDK tools depend on libraries that require Java runtime 17 or higher.
   ? "--java_runtime_version=17"
 rules_flags: &rules_flags
   ? "--enable_bzlmod=false"
+  ? "--enable_workspace=true"
 
 tools: &tools
   name: "Tools"
@@ -34,9 +38,11 @@ tools_bzlmod: &tools_bzlmod
   build_flags:
     <<: *tools_flags
     ? "--enable_bzlmod"
+    ? "--enable_workspace=false"
   test_flags:
     <<: *tools_flags
     ? "--enable_bzlmod"
+    ? "--enable_workspace=false"
   <<: *tools
 rules: &rules
   name: "Rules"
@@ -53,52 +59,66 @@ rules_bzlmod: &rules_bzlmod
   build_flags:
     <<: *rules_flags
     ? "--enable_bzlmod"
+    ? "--enable_workspace=false"
   test_flags:
     <<: *rules_flags
     ? "--enable_bzlmod"
+    ? "--enable_workspace=false"
   <<: *rules
 
 tasks:
   ubuntu2004_tools:
     platform: ubuntu2004
+    bazel: ${{ bazel }}
     <<: *tools
   ubuntu2004_rules:
     platform: ubuntu2004
+    bazel: ${{ bazel }}
     <<: *rules
   macos_tools:
     platform: macos
+    bazel: ${{ bazel }}
     <<: *tools
   macos_rules:
     platform: macos
+    bazel: ${{ bazel }}
     <<: *rules
   macos_arm64_tools:
     platform: macos_arm64
+    bazel: ${{ bazel }}
     <<: *tools
   macos_arm64_rules:
     platform: macos_arm64
+    bazel: ${{ bazel }}
     <<: *rules
   ubuntu2004_tools_bzlmod:
     platform: ubuntu2004
+    bazel: ${{ bazel }}
     <<: *tools_bzlmod
   ubuntu2004_rules_bzlmod:
     platform: ubuntu2004
+    bazel: ${{ bazel }}
     <<: *rules_bzlmod
   macos_bzlmods_tools:
     platform: macos
+    bazel: ${{ bazel }}
     <<: *tools_bzlmod
   macos_bzlmods_rules:
     platform: macos
+    bazel: ${{ bazel }}
     <<: *rules_bzlmod
   macos_arm64_tools_bzlmod:
     platform: macos_arm64
+    bazel: ${{ bazel }}
     <<: *tools_bzlmod
   macos_arm64_rules_bzlmod:
     platform: macos_arm64
+    bazel: ${{ bazel }}
     <<: *rules_bzlmod
   ubuntu2004_basicapp:
     name: "Basic app ubuntu"
     platform: ubuntu2004
-    name: basicapp
+    bazel: ${{ bazel }}
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
@@ -107,17 +127,18 @@ tasks:
   ubuntu2004_basicapp_bzlmod:
     name: "Basic app ubuntu bzlmod"
     platform: ubuntu2004
-    name: basicapp
+    bazel: ${{ bazel }}
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
       ? "--enable_bzlmod"
+      ? "--enable_workspace=false"
     build_targets:
       - "//java/com/basicapp:basic_app"
   macos_arm64_basicapp:
     name: "Basic app mac arm64"
     platform: macos_arm64
-    name: basicapp
+    bazel: ${{ bazel }}
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
@@ -126,20 +147,31 @@ tasks:
   macos_arm64_basicapp_bzlmod:
     name: "Basic app mac arm64 bzlmod"
     platform: macos_arm64
-    name: basicapp
+    bazel: ${{ bazel }}
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
       ? "--enable_bzlmod"
+      ? "--enable_workspace=false"
     build_targets:
       - "//java/com/basicapp:basic_app"
   windows_basicapp_bzlmod:
     name: "Windows Basicapp Bzlmod"
     platform: windows
-    name: basicapp
+    bazel: ${{ bazel }}
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
       ? "--enable_bzlmod"
+      ? "--enable_workspace=false"
+    build_targets:
+      - "//java/com/basicapp:basic_app"
+  windows_basicapp:
+    name: "Windows Basicapp"
+    platform: windows
+    bazel: ${{ bazel }}
+    working_directory: examples/basicapp
+    build_flags:
+      <<: *rules_flags
     build_targets:
-      - "//java/com/basicapp:basic_app"
+      - "//java/com/basicapp:basic_app"

.bazelrc

@@ -1,3 +1,10 @@
 common --experimental_google_legacy_api
 common --experimental_enable_android_migration_apis
 common --java_runtime_version=17
+common --android_sdk=@androidsdk//:sdk
+
+# Autoloads are disabled for rule repositories (and their deps).
+# These autoloads are still helpful for rules_android to load rules in
+# non-rule repositories such as gazelle, though.
+# See https://github.com/bazelbuild/bazel/blob/14538435c8e96d1ed8cb9557209a35ebd2683356/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java#L598
+common --incompatible_autoload_externally=+@rules_shell,+@rules_java,+@rules_cc,+@rules_python,+@protobuf

.bazelversion

@@ -0,0 +1 @@
+7.4.0

.bcr/config.yml

@@ -0,0 +1,3 @@
+fixedReleaser:
+  login: ahumesky
+  email: [email protected]

.bcr/metadata.template.json

@@ -0,0 +1,20 @@
+{
+    "homepage": "https://github.com/bazelbuild/rules_android",
+    "maintainers": [
+        {
+            "email": "[email protected]",
+            "github": "ahumesky",
+            "name": "ahumesky"
+        },
+        {
+            "email": "[email protected]",
+            "github": "ted-xie",
+            "name": "tedx"
+        }
+    ],
+    "repository": [
+        "github:bazelbuild/rules_android"
+    ],
+    "versions": [],
+    "yanked_versions": {}
+}

.bcr/presubmit.yml

@@ -0,0 +1,12 @@
+bcr_test_module:
+  module_path: examples/basicapp
+  matrix:
+    platform: ["ubuntu2004", "macos", "windows"]
+    bazel: ["7.2.1", "7.4.0", "8.x", "rolling"]
+  tasks:
+    run_test_module:
+      name: "Verify build targets with bzlmod"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      build_targets:
+        - "//java/com/basicapp:basic_app"

.bcr/source.template.json

@@ -0,0 +1,5 @@
+{
+    "integrity": "",
+    "strip_prefix": "rules_android-{TAG}",
+    "url": "https://github.com/bazelbuild/rules_android/archive/refs/tags/{TAG}.tar.gz"
+}

.github/workflows/ci.bazelrc

@@ -0,0 +1,15 @@
+# This file contains Bazel settings to apply on CI only.
+# It is referenced with a --bazelrc option in the call to bazel in ci.yaml
+
+# Debug where options came from
+build --announce_rc
+# This directory is configured in GitHub actions to be persisted between runs.
+# We do not enable the repository cache to cache downloaded external artifacts
+# as these are generally faster to download again than to fetch them from the
+# GitHub actions cache.
+build --disk_cache=~/.cache/bazel
+# Don't rely on test logs being easily accessible from the test runner,
+# though it makes the log noisier.
+test --test_output=errors
+# Allows tests to run bazelisk-in-bazel, since this is the cache folder used
+test --test_env=XDG_CACHE_HOME

.github/workflows/release.yml

@@ -0,0 +1,19 @@
+# Cut a release whenever a new tag is pushed to the repo.
+# You should use an annotated tag, like `git tag -a v1.2.3`
+# and put the release notes into the commit message for the tag.
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    uses: bazel-contrib/.github/.github/workflows/release_ruleset.yaml@v6
+    with:
+      release_files: rules_android-*.tar.gz
+      bazel_test_command: "cd examples/basicapp && bazel build java/com/basicapp:basic_app"

.github/workflows/release_prep.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+# Copyright 2024 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.
+
+set -o errexit -o nounset -o pipefail
+
+# Set by GH actions, see
+# https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
+TAG=${GITHUB_REF_NAME}
+# The prefix is chosen to match what GitHub generates for source archives
+# This guarantees that users can easily switch from a released artifact to a source archive
+# with minimal differences in their code (e.g. strip_prefix remains the same)
+PREFIX="rules_android-${TAG:1}"
+ARCHIVE="rules_android-$TAG.tar.gz"
+
+# NB: configuration for 'git archive' is in /.gitattributes
+git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip > $ARCHIVE
+SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}')
+
+cat << EOF
+## Using Bzlmod with Bazel 6 or greater
+
+1. (Bazel 6 only) Enable with \`common --enable_bzlmod\` in \`.bazelrc\`.
+2. Add to your \`MODULE.bazel\` file:
+
+\`\`\`starlark
+bazel_dep(name = "rules_android", version = "${TAG:1}")
+\`\`\`
+
+## Using WORKSPACE
+
+Paste this snippet into your \`WORKSPACE.bazel\` file:
+
+\`\`\`starlark
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_android",
+    sha256 = "${SHA}",
+    strip_prefix = "${PREFIX}",
+    url = "https://github.com/bazelbuild/rules_android/releases/download/${TAG}/${ARCHIVE}",
+)
+EOF
+
+awk 'f;/--SNIP--/{f=1}' examples/basicapp/WORKSPACE
+echo "\`\`\`" 
+
+cat << EOF
+
+## In BUILD
+
+Load the rules from \`rules_android\`:
+
+\`\`\`starlark
+load("@rules_android//rules:rules.bzl", "android_binary", "android_library")
+android_binary(
+    ...
+)
+
+android_library(
+   ...
+)
+\`\`\`
+EOF
+