Migrated iOS examples to bzlmod

examples/ios/.bazelrc

@@ -1,16 +1,77 @@
-# Required on windows
+###############################################################################
+## Bazel Configuration Flags
+##
+## `.bazelrc` is a Bazel configuration file.
+## https://bazel.build/docs/best-practices#bazelrc-file
+###############################################################################
+
+# https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
 common --enable_platform_specific_config
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
 
-# Enable CC toolchain that supports iOS from https://github.com/bazelbuild/apple_support
-build --apple_crosstool_top=@local_config_apple_cc//:toolchain
-build --crosstool_top=@local_config_apple_cc//:toolchain
-build --host_crosstool_top=@local_config_apple_cc//:toolchain
+# Enable the only currently supported report type
+# https://bazel.build/reference/command-line-reference#flag--combined_report
+coverage --combined_report=lcov
+
+# Avoid fully cached builds reporting no coverage and failing CI
+# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
+coverage --experimental_fetch_all_coverage_outputs
+
+# Required for some of the tests
+# https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library
+common --experimental_cc_shared_library
+
+###############################################################################
+## Unique configuration groups
+###############################################################################
+
+# Enable use of the nightly toolchains.
+build:nightly --@rules_rust//rust/toolchain/channel=nightly
+
+# Enable rustfmt for all targets in the workspace
+build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
+build:rustfmt --output_groups=+rustfmt_checks
+
+# Enable clippy for all targets in the workspace
+build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
+build:clippy --output_groups=+clippy_checks
+
+# Enable unpretty for all targets in the workspace
+build:unpretty --aspects=@rules_rust//rust:defs.bzl%rust_unpretty_aspect
+build:unpretty --output_groups=+rust_unpretty
+
+# `unpretty` requires the nightly toolchain. See tracking issue:
+# https://github.com/rust-lang/rust/issues/43364
+build:unpretty --config=nightly
+
+###############################################################################
+## Incompatibility flags
+###############################################################################
+
+# https://github.com/bazelbuild/bazel/issues/8195
+build --incompatible_disallow_empty_glob=true
+
+# https://github.com/bazelbuild/bazel/issues/12821
+build --nolegacy_external_runfiles
+
+# Required for cargo_build_script support before Bazel 7
+build --incompatible_merge_fixed_and_default_shell_env
+
+###############################################################################
+## Bzlmod
+###############################################################################
+
+# A configuration for disabling bzlmod.
+common:no-bzlmod --noenable_bzlmod --enable_workspace
+
+# Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock
+common --lockfile_mode=off
 
-# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
-# https://github.com/bazelbuild/rules_rust/issues/2181
-common --noenable_bzlmod
+###############################################################################
+## Custom user flags
+##
+## This should always be the last thing in the `.bazelrc` file to ensure
+## consistent behavior when setting flags in that file as `.bazelrc` files are
+## evaluated top to bottom.
+###############################################################################
 
-# This isn't currently the defaut in Bazel, but we enable it to test we'll be ready if/when it flips.
-build --incompatible_disallow_empty_glob
+try-import %workspace%/user.bazelrc

examples/ios/.gitignore

@@ -1 +1,2 @@
 /bazel-*
+user.bazelrc

examples/ios/MODULE.bazel

@@ -0,0 +1,53 @@
+module(
+    name = "rules_rust_example_ios",
+    version = "0.0.0",
+)
+
+###############################################################################
+# B A Z E L  C E N T R A L  R E G I S T R Y # https://registry.bazel.build/
+###############################################################################
+# https://github.com/bazelbuild/rules_rust/releases
+bazel_dep(name = "rules_rust", version = "0.46.0")
+local_path_override(
+    module_name = "rules_rust",
+    path = "../..",
+)
+
+bazel_dep(
+    name = "rules_apple",
+    version = "3.16.1",
+    repo_name = "build_bazel_rules_apple",
+)
+single_version_override(
+    module_name = "rules_apple",
+    patch_strip = 1,
+    patches = ["//:environment_plist.patch"],
+)
+bazel_dep(
+    name = "apple_support",
+    version = "1.17.1",
+    repo_name = "build_bazel_apple_support",
+)
+bazel_dep(
+    name = "rules_swift",
+    version = "2.3.1",
+    repo_name = "build_bazel_rules_swift",
+)
+
+###############################################################################
+# T O O L C H A I N S
+###############################################################################
+
+# Rust toolchain
+rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
+rust.toolchain(
+    extra_target_triples = [
+        "aarch64-apple-ios-sim",
+        "x86_64-apple-ios",
+        "aarch64-apple-darwin",
+        "x86_64-apple-darwin",
+    ],
+)
+use_repo(rust, "rust_toolchains")
+
+register_toolchains("@rust_toolchains//:all")

examples/ios/WORKSPACE.bazel

@@ -1,56 +1 @@
-workspace(name = "ios_examples")
-
-# Users of `rules_rust` will commonly be unable to load it
-# using a `local_repository`. Instead, to setup the rules,
-# please see https://bazelbuild.github.io/rules_rust/#setup
-local_repository(
-    name = "rules_rust",
-    path = "../..",
-)
-
-load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
-rules_rust_dependencies()
-
-rust_register_toolchains(
-    edition = "2018",
-    extra_target_triples = [
-        "aarch64-apple-ios-sim",
-        "x86_64-apple-ios",
-        "aarch64-apple-darwin",
-        "x86_64-apple-darwin",
-    ],
-)
-
-load("@rules_rust//rust:repositories_transitive.bzl", "rules_rust_transitive_dependencies")
-
-rules_rust_transitive_dependencies()
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "build_bazel_rules_apple",
-    sha256 = "ed432a2d5929452748bd53a4ff9e652f2332283eb3d7ffad6cb63aab96a06301",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/3.4.0/rules_apple.3.4.0.tar.gz",
-)
-
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
-)
-
-swift_rules_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
+workspace(name = "rules_rust_example_ios")

examples/ios/environment_plist.patch

@@ -0,0 +1,13 @@
+diff --git a/tools/environment_plist/environment_plist.sh b/tools/environment_plist/environment_plist.sh
+index 1dca56d..926a179 100755
+--- a/tools/environment_plist/environment_plist.sh
++++ b/tools/environment_plist/environment_plist.sh
+@@ -24,7 +24,7 @@
+ # --platform  - the target platform, e.g. 'iphoneos' or 'iphonesimulator8.3'
+ #
+
+-set -eu
++set -xeu
+
+ while [[ $# > 1 ]]
+ do

examples/ios_build/.bazelrc

@@ -1,16 +1,77 @@
-# Required on windows
+###############################################################################
+## Bazel Configuration Flags
+##
+## `.bazelrc` is a Bazel configuration file.
+## https://bazel.build/docs/best-practices#bazelrc-file
+###############################################################################
+
+# https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
 common --enable_platform_specific_config
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
 
-# Enable CC toolchain that supports iOS from https://github.com/bazelbuild/apple_support
-build --apple_crosstool_top=@local_config_apple_cc//:toolchain
-build --crosstool_top=@local_config_apple_cc//:toolchain
-build --host_crosstool_top=@local_config_apple_cc//:toolchain
+# Enable the only currently supported report type
+# https://bazel.build/reference/command-line-reference#flag--combined_report
+coverage --combined_report=lcov
+
+# Avoid fully cached builds reporting no coverage and failing CI
+# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
+coverage --experimental_fetch_all_coverage_outputs
+
+# Required for some of the tests
+# https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library
+common --experimental_cc_shared_library
+
+###############################################################################
+## Unique configuration groups
+###############################################################################
+
+# Enable use of the nightly toolchains.
+build:nightly --@rules_rust//rust/toolchain/channel=nightly
+
+# Enable rustfmt for all targets in the workspace
+build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
+build:rustfmt --output_groups=+rustfmt_checks
+
+# Enable clippy for all targets in the workspace
+build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
+build:clippy --output_groups=+clippy_checks
+
+# Enable unpretty for all targets in the workspace
+build:unpretty --aspects=@rules_rust//rust:defs.bzl%rust_unpretty_aspect
+build:unpretty --output_groups=+rust_unpretty
+
+# `unpretty` requires the nightly toolchain. See tracking issue:
+# https://github.com/rust-lang/rust/issues/43364
+build:unpretty --config=nightly
+
+###############################################################################
+## Incompatibility flags
+###############################################################################
+
+# https://github.com/bazelbuild/bazel/issues/8195
+build --incompatible_disallow_empty_glob=true
+
+# https://github.com/bazelbuild/bazel/issues/12821
+build --nolegacy_external_runfiles
+
+# Required for cargo_build_script support before Bazel 7
+build --incompatible_merge_fixed_and_default_shell_env
+
+###############################################################################
+## Bzlmod
+###############################################################################
+
+# A configuration for disabling bzlmod.
+common:no-bzlmod --noenable_bzlmod --enable_workspace
+
+# Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock
+common --lockfile_mode=off
 
-# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
-# https://github.com/bazelbuild/rules_rust/issues/2181
-common --noenable_bzlmod
+###############################################################################
+## Custom user flags
+##
+## This should always be the last thing in the `.bazelrc` file to ensure
+## consistent behavior when setting flags in that file as `.bazelrc` files are
+## evaluated top to bottom.
+###############################################################################
 
-# This isn't currently the defaut in Bazel, but we enable it to test we'll be ready if/when it flips.
-build --incompatible_disallow_empty_glob
+try-import %workspace%/user.bazelrc

examples/ios_build/.gitignore

@@ -1 +1,2 @@
-bazel-*
+/bazel-*
+user.bazelrc

examples/ios_build/3rdparty/crates/BUILD.bazel

@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @//3rdparty:crates_vendor
+#     bazel run @@//3rdparty:crates_vendor
 ###############################################################################
 
 package(default_visibility = ["//visibility:public"])
@@ -33,6 +33,6 @@ filegroup(
 # Workspace Member Dependencies
 alias(
     name = "zstd",
-    actual = "@ios_build__zstd-0.11.2-zstd.1.5.2//:zstd",
+    actual = "@ios_build__zstd-0.13.2//:zstd",
     tags = ["manual"],
 )

examples/ios_build/3rdparty/crates/BUILD.cc-1.0.73.bazel

@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @//3rdparty:crates_vendor
+#     bazel run @@//3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

examples/ios_build/3rdparty/crates/BUILD.jobserver-0.1.25.bazel

@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @//3rdparty:crates_vendor
+#     bazel run @@//3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

examples/ios_build/3rdparty/crates/BUILD.libc-0.2.134.bazel

@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @//3rdparty:crates_vendor
+#     bazel run @@//3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//cargo:defs.bzl", "cargo_build_script")