Merge branch 'main' into feat/add-coverage-options

Author: lucasromanomr

.bazelversion

@@ -1 +1 @@
-7.1.1
+8.0.0

MODULE.bazel

@@ -16,7 +16,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.6.0",
+    version = "3.16.1",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(name = "rules_python", version = "0.27.1")
@@ -45,7 +45,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_pkg",
-    version = "0.9.1",
+    version = "1.0.1",
     dev_dependency = True,
 )
 bazel_dep(
@@ -55,26 +55,21 @@ bazel_dep(
     repo_name = "io_bazel_stardoc",
 )
 
-# To support Bazel 8 tests
+# Use newer versions of deps in development
 single_version_override(
-    module_name = "rules_apple",
-    version = "3.5.1",
+    module_name = "apple_support",
+    version = "1.17.1",
 )
 
 single_version_override(
     module_name = "rules_swift",
-    version = "1.18.0",
+    version = "2.3.0",
 )
 
+# Some of our deps are forcing a new stardoc on us, so pinning for now
 single_version_override(
-    module_name = "apple_support",
-    version = "1.15.1",
-)
-
-# For Stardoc
-single_version_override(
-    module_name = "bazel_skylib",
-    version = "1.6.0",
+    module_name = "stardoc",
+    version = "0.6.1",
 )
 
 apple_cc_configure = use_extension(

README.md

@@ -80,7 +80,8 @@ to include it in the list above.
 
 | rules_xcodeproj | Bazel | [rules_apple][1] | [rules_swift][2] | Xcode | macOS | Supporting Branch |
 | :-------------: | :---: | :--------------: | :--------------: | :---: | :---: | :---------------: |
-| 1.17.0+ | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.x | 13–14.x | `main` |
+| 2.10.0+ | 7.0-9.x | 3.16.1+ | 1.18.0+ | 13.3–15.x | 13–14.x | `main` |
+| 1.17.0+ | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.x | 13–14.x | - |
 | 1.16.0 | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |
 | 1.14.0-1.15.0 | 6.1-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |
 | 1.7.0-1.13.0 | 5.3–6.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 12–13.x | - |

bazel_6.bazelrc

@@ -1,3 +1 @@
-common --incompatible_fail_on_unknown_attributes
-
-build:cache --remote_build_event_upload=minimal
+common --incompatible_disallow_empty_glob

bazel_7.bazelrc

@@ -17,16 +17,13 @@ x_templates:
       env: {}
     - &bazel_previous_lts
       env:
-        USE_BAZEL_VERSION: 6.x
+        USE_BAZEL_VERSION: 7.x
     - &bazel_lts
       env:
-        USE_BAZEL_VERSION: 7.x
+        USE_BAZEL_VERSION: 8.x
     - &bazel_head
       env:
-        # See https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3029
-        #
-        # Temporary change to make CI pass until the fix is in `last_green`
-        USE_BAZEL_VERSION: dd2464a5933e0a5a6765024573832717b71989bf
+        USE_BAZEL_VERSION: last_green
 
     - &normal_resources
       resource_requests: { memory: 6GB }
@@ -130,14 +127,6 @@ actions:
       # Not validate since Bazel 8 Bzlmod paths are different
       - *generate_integration
       - *build_all
-  - name: Integration Test - "examples/integration" - Bazel LTS using WORKSPACE
-    <<: *bazel_lts
-    <<: *action_base
-    <<: *normal_resources
-    <<: *examples_integration_workspace
-    bazel_commands:
-      - *nobzlmod_generate_integration
-      - *nobzlmod_build_all
   - name: Integration Test - "examples/integration" - Bazel HEAD
     <<: *bazel_head
     <<: *arm64
@@ -147,14 +136,6 @@ actions:
     bazel_commands:
       - *validate_integration
       - *build_all
-  - name: Integration Test - "examples/integration" - Bazel HEAD using WORKSPACE
-    <<: *bazel_head
-    <<: *action_base
-    <<: *normal_resources
-    <<: *examples_integration_workspace
-    bazel_commands:
-      - *nobzlmod_generate_integration
-      - *nobzlmod_build_all
 
   - name: Integration Test - "examples/rules_ios" - Bazel Previous LTS
     <<: *bazel_previous_lts
@@ -175,15 +156,6 @@ actions:
     bazel_commands:
       - *validate_integration
       - *build_all
-  - name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
-    <<: *bazel_lts
-    <<: *arm64
-    <<: *action_base
-    <<: *normal_resources
-    <<: *examples_rules_ios_workspace
-    bazel_commands:
-      - *validate_integration
-      - *nobzlmod_build_all
   ## Uncomment once rules_ios supports Bazel 8
   # - name: Integration Test - "examples/rules_ios" - Bazel HEAD
   #   <<: *bazel_head

bazel_9.bazelrc

@@ -3,6 +3,9 @@ import %workspace%/../../shared.bazelrc
 
 build --experimental_cc_implementation_deps
 
+# Until we fix our examples for Bazel 8
+common --enable_workspace
+
 # Exercise the extra flags feature
 
 build:rules_xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags='--verbose_failures'

buildbuddy.yaml

@@ -15,7 +15,7 @@
 	<key>EXAppExtensionAttributes</key>
 	<dict>
         <key>EXExtensionPointIdentifier</key>
-        <string>com.apple.generic-extension</string>
+        <string>com.apple.services</string>
 	</dict>
 </dict>
 </plist>

examples/integration/.bazelrc

@@ -10,7 +10,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.6.0",
+    version = "3.16.1",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(