Merge branch 'main' into udaya2899/cppregpattern

bazelbuild · Jul 9, 2024 · 8053d2f · 8053d2f
2 parents 406510a + 5269e93
commit 8053d2f
Show file tree

Hide file tree

Showing 15 changed files with 294 additions and 3 deletions.
diff --git a/modules/rules_ios/4.8.1/MODULE.bazel b/modules/rules_ios/4.8.1/MODULE.bazel
@@ -0,0 +1,103 @@
+"""
+Defines all the external repositories and dependencies for rules_ios.
+"""
+
+# Defines the rules_ios bzlmod module.
+# Version is updated during release to the registry.
+module(
+    name = "rules_ios",
+    version = "4.8.1",
+    bazel_compatibility = [
+        ">=6.0.0",
+    ],
+    compatibility_level = 1,
+    repo_name = "build_bazel_rules_ios",
+)
+
+# Declare the bzlmod dependencies needed by rules_ios and users of rules_ios
+bazel_dep(
+    name = "apple_support",
+    version = "1.15.1",
+    repo_name = "build_bazel_apple_support",
+)
+bazel_dep(
+    name = "rules_apple",
+    version = "3.5.1",
+    repo_name = "build_bazel_rules_apple",
+)
+bazel_dep(
+    name = "rules_cc",
+    version = "0.0.6",
+)
+bazel_dep(
+    name = "rules_swift",
+    version = "1.18.0",
+    repo_name = "build_bazel_rules_swift",
+)
+bazel_dep(
+    name = "bazel_skylib",
+    version = "1.4.2",
+)
+
+# Declare the development dependencies needed for rules_ios development
+bazel_dep(
+    name = "buildifier_prebuilt",
+    version = "6.1.0",
+    dev_dependency = True,
+)
+bazel_dep(
+    name = "rules_pkg",
+    version = "0.9.1",
+    dev_dependency = True,
+)
+bazel_dep(
+    name = "stardoc",
+    version = "0.6.2",
+    dev_dependency = True,
+    repo_name = "io_bazel_stardoc",
+)
+
+# Load non-bzlmod dependencies from rules_ios
+non_module_deps = use_extension("//rules:module_extensions.bzl", "non_module_deps")
+use_repo(
+    non_module_deps,
+    "arm64-to-sim",
+    "com_github_yonaskolb_xcodegen",
+    "tart",
+)
+
+non_module_dev_deps = use_extension(
+    "//rules:module_extensions.bzl",
+    "non_module_dev_deps",
+    dev_dependency = True,
+)
+use_repo(
+    non_module_dev_deps,
+    "com_github_apple_swiftcollections",
+)
+
+# Configure Xcode
+xcode_configure = use_extension(
+    "//rules:module_extensions.bzl",
+    "xcode_configure",
+    dev_dependency = True,
+)
+xcode_configure.configure(
+    remote_xcode_label = "",
+    xcode_locator_label = "//tools/toolchains/xcode_configure:xcode_locator.m",
+)
+
+# Load non-bzlmod dependencies used in this repo from rules_swift
+swift_non_module_deps = use_extension("@build_bazel_rules_swift//swift:extensions.bzl", "non_module_deps")
+use_repo(
+    swift_non_module_deps,
+    "build_bazel_rules_swift_index_import",
+    "build_bazel_rules_swift_local_config",
+)
+
+# Load non-bzlmod dependencies used in this repo from rules_apple
+apple_non_module_deps = use_extension("@build_bazel_rules_apple//apple:extensions.bzl", "non_module_deps")
+use_repo(
+    apple_non_module_deps,
+    "xctestrunner",
+)
diff --git a/modules/rules_ios/4.8.1/patches/module_dot_bazel_version.patch b/modules/rules_ios/4.8.1/patches/module_dot_bazel_version.patch
@@ -0,0 +1,14 @@
+===================================================================
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -5,9 +5,9 @@
+ # Defines the rules_ios bzlmod module.
+ # Version is updated during release to the registry.
+ module(
+     name = "rules_ios",
+-    version = "0",
++    version = "4.8.1",
+     bazel_compatibility = [
+         ">=6.0.0",
+     ],
+     compatibility_level = 1,
diff --git a/modules/rules_ios/4.8.1/presubmit.yml b/modules/rules_ios/4.8.1/presubmit.yml
@@ -0,0 +1,17 @@
+matrix:
+  bazel: ["6.x", "7.x"]
+tasks:
+  verify_build_targets_bazel_6:
+    name: Verify Build targets on macOS with Bazel 6
+    platform: macos_arm64
+    bazel: 6.x
+    build_targets:
+      - "@rules_ios//rules/..."
+  verify_build_targets_bazel_7:
+    name: Verify Build targets on macOS with Bazel 7
+    platform: macos_arm64
+    bazel: 7.x
+    build_targets:
+      - "@rules_ios//rules/..."
+    build_flags:
+      - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
diff --git a/modules/rules_ios/4.8.1/source.json b/modules/rules_ios/4.8.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-7kFZvrnJd9CSIz9S7u9D9VOdQwntkdy8xyCqSRYPRRo=",
+    "strip_prefix": "",
+    "url": "https://github.com/bazel-ios/rules_ios/releases/download/4.8.1/rules_ios.4.8.1.tar.gz",
+    "patches": {
+        "module_dot_bazel_version.patch": "sha256-HDl7eLVe1qSJPV+y3CJl5usfGkAIILXbEJQFwSYD9Qs="
+    },
+    "patch_strip": 1
+}
diff --git a/modules/rules_ios/metadata.json b/modules/rules_ios/metadata.json
@@ -34,7 +34,8 @@
         "4.6.0",
         "4.7.0",
         "4.7.1",
-        "4.8.0"
+        "4.8.0",
+        "4.8.1"
     ],
     "yanked_versions": {}
 }
diff --git a/modules/rules_itest/0.0.17/MODULE.bazel b/modules/rules_itest/0.0.17/MODULE.bazel
@@ -0,0 +1,11 @@
+module(
+    name = "rules_itest",
+    version = "0.0.17",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "aspect_bazel_lib", version = "1.42.0")
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "rules_go", version = "0.44.0")
+
+bazel_dep(name = "gazelle", version = "0.34.0", dev_dependency = True)
diff --git a/modules/rules_itest/0.0.17/patches/module_dot_bazel_version.patch b/modules/rules_itest/0.0.17/patches/module_dot_bazel_version.patch
@@ -0,0 +1,12 @@
+===================================================================
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -1,7 +1,7 @@
+ module(
+     name = "rules_itest",
+-    version = "0.0.1",
++    version = "0.0.17",
+     compatibility_level = 1,
+ )
+
+ bazel_dep(name = "aspect_bazel_lib", version = "1.42.0")
diff --git a/modules/rules_itest/0.0.17/presubmit.yml b/modules/rules_itest/0.0.17/presubmit.yml
@@ -0,0 +1,12 @@
+bcr_test_module:
+  module_path: "tests"
+  matrix:
+    platform: ["debian10", "macos", "ubuntu2004", "windows"]
+    bazel: [6.x, 7.x, rolling]
+  tasks:
+    run_tests:
+      name: "Run tests"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      test_targets:
+        - "//..."
diff --git a/modules/rules_itest/0.0.17/source.json b/modules/rules_itest/0.0.17/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-bCBURa2kifCfkaydgFvlej+eq92Ee7HAdxZUdzgRndI=",
+    "strip_prefix": "rules_itest-0.0.17",
+    "url": "https://github.com/dzbarsky/rules_itest/releases/download/v0.0.17/rules_itest-v0.0.17.tar.gz",
+    "patches": {
+        "module_dot_bazel_version.patch": "sha256-X6wLbaOCIfH288poEsZyWrqEZdcBD7y8j1+EWvmkwRc="
+    },
+    "patch_strip": 1
+}
diff --git a/modules/rules_itest/metadata.json b/modules/rules_itest/metadata.json
@@ -14,7 +14,8 @@
         "0.0.9",
         "0.0.13",
         "0.0.14",
-        "0.0.15"
+        "0.0.15",
+        "0.0.17"
     ],
     "yanked_versions": {}
 }
diff --git a/modules/rules_swift/2.0.0/MODULE.bazel b/modules/rules_swift/2.0.0/MODULE.bazel
@@ -0,0 +1,44 @@
+module(
+    name = "rules_swift",
+    version = "2.0.0",
+    bazel_compatibility = [">=6.0.0"],
+    compatibility_level = 2,
+    repo_name = "build_bazel_rules_swift",
+)
+
+bazel_dep(name = "bazel_features", version = "1.3.0")
+bazel_dep(name = "bazel_skylib", version = "1.3.0")
+bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "rules_cc", version = "0.0.2")
+bazel_dep(name = "platforms", version = "0.0.9")
+bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+bazel_dep(name = "nlohmann_json", version = "3.6.1", repo_name = "com_github_nlohmann_json")
+bazel_dep(
+    name = "swift_argument_parser",
+    version = "1.3.1.1",
+    repo_name = "com_github_apple_swift_argument_parser",
+)
+
+non_module_deps = use_extension("//swift:extensions.bzl", "non_module_deps")
+use_repo(
+    non_module_deps,
+    "build_bazel_rules_swift_index_import",
+    "build_bazel_rules_swift_local_config",
+    "com_github_apple_swift_docc_symbolkit",
+    "com_github_apple_swift_log",
+    "com_github_apple_swift_nio",
+    "com_github_apple_swift_nio_extras",
+    "com_github_apple_swift_nio_http2",
+    "com_github_apple_swift_nio_transport_services",
+    "com_github_apple_swift_protobuf",
+    "com_github_grpc_grpc_swift",
+)
+
+apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
+# Dev dependencies
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
+bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle")
+bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
diff --git a/modules/rules_swift/2.0.0/patches/module_dot_bazel_version.patch b/modules/rules_swift/2.0.0/patches/module_dot_bazel_version.patch
@@ -0,0 +1,12 @@
+===================================================================
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -1,7 +1,7 @@
+ module(
+     name = "rules_swift",
+-    version = "0",
++    version = "2.0.0",
+     bazel_compatibility = [">=6.0.0"],
+     compatibility_level = 2,
+     repo_name = "build_bazel_rules_swift",
+ )
diff --git a/modules/rules_swift/2.0.0/presubmit.yml b/modules/rules_swift/2.0.0/presubmit.yml
@@ -0,0 +1,36 @@
+shell_commands: &shell_commands
+- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
+- "mkdir $SWIFT_HOME"
+- "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+
+matrix:
+  bazel:
+  - 7.x
+  - last_green
+  platform:
+  - ubuntu2004
+tasks:
+  verify_targets:
+    name: Verify build targets
+    bazel: ${{ bazel }}
+    platform: ${{ platform }}
+    environment:
+      CC: "clang"
+      SWIFT_VERSION: "5.9.2"
+      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
+      PATH: "$PATH:$SWIFT_HOME/usr/bin"
+    shell_commands: *shell_commands
+    build_flags:
+    - "--action_env=PATH"
+    build_targets:
+    - "@rules_swift//examples/xplatform/..."
+    - "-@rules_swift//examples/xplatform/grpc/..." # TODO: Fix grpc on Linux
+    - "-@rules_swift//examples/xplatform/proto_library_group/..." # TODO: Fix grpc on Linux
+  verify_targets_macos:
+    name: Verify build targets
+    bazel: ${{ bazel }}
+    platform: macos
+    build_targets:
+    - "@rules_swift//examples/apple/..."
+    build_flags:
+    - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
diff --git a/modules/rules_swift/2.0.0/source.json b/modules/rules_swift/2.0.0/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-Mu607zPHCNnJpO4PqEdTIu8UnavIGITdw7UOsu//eEM=",
+    "strip_prefix": "",
+    "url": "https://github.com/bazelbuild/rules_swift/releases/download/2.0.0/rules_swift.2.0.0.tar.gz",
+    "patches": {
+        "module_dot_bazel_version.patch": "sha256-RkuvO6fcoi4NwNmTBLyV6doI3uNXmZyAOWqGaBGCDC8="
+    },
+    "patch_strip": 1
+}
diff --git a/modules/rules_swift/metadata.json b/modules/rules_swift/metadata.json
@@ -46,7 +46,8 @@
         "1.16.0",
         "1.17.0",
         "1.18.0",
-        "2.0.0-rc1"
+        "2.0.0-rc1",
+        "2.0.0"
     ],
     "yanked_versions": {}
 }