From a018fa4a517baefbd716a9b7b173caaad124c7fa Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Thu, 7 Sep 2023 10:29:25 -0700
Subject: [PATCH 1/3] Add platform mappings

Replace https://github.com/bazelbuild/rules_swift/pull/1102 with support
for bzlmod
---
 .bazelci/presubmit.yml   |   2 +
 platform_mappings        | 120 +++++++++++++++++++++++++++++++++++++++
 platform_mappings_bzlmod | 120 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 242 insertions(+)
 create mode 100644 platform_mappings
 create mode 100644 platform_mappings_bzlmod

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 3218970bb..1d6e4c358 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -56,8 +56,10 @@ tasks:
     <<: *mac_common
     build_flags:
       - "--enable_bzlmod"
+      - "--platform_mappings=platform_mappings_bzlmod"
     test_flags:
       - "--enable_bzlmod"
+      - "--platform_mappings=platform_mappings_bzlmod"
 
   macos_last_green:
     name: "Last Green Bazel"
diff --git a/platform_mappings b/platform_mappings
new file mode 100644
index 000000000..d31b6f119
--- /dev/null
+++ b/platform_mappings
@@ -0,0 +1,120 @@
+platforms:
+  @build_bazel_apple_support//platforms:macos_x86_64
+    --cpu=darwin_x86_64
+
+  @build_bazel_apple_support//platforms:macos_arm64
+    --cpu=darwin_arm64
+
+  @build_bazel_apple_support//platforms:darwin_arm64e
+    --cpu=darwin_arm64e
+
+  @build_bazel_apple_support//platforms:ios_i386
+    --cpu=ios_i386
+
+  @build_bazel_apple_support//platforms:ios_x86_64
+    --cpu=ios_x86_64
+
+  @build_bazel_apple_support//platforms:ios_sim_arm64
+    --cpu=ios_sim_arm64
+
+  @build_bazel_apple_support//platforms:ios_armv7
+    --cpu=ios_armv7
+
+  @build_bazel_apple_support//platforms:ios_arm64
+    --cpu=ios_arm64
+
+  @build_bazel_apple_support//platforms:ios_arm64e
+    --cpu=ios_arm64e
+
+  @build_bazel_apple_support//platforms:tvos_x86_64
+    --cpu=tvos_x86_64
+
+  @build_bazel_apple_support//platforms:tvos_sim_arm64
+    --cpu=tvos_sim_arm64
+
+  @build_bazel_apple_support//platforms:tvos_arm64
+    --cpu=tvos_arm64
+
+  @build_bazel_apple_support//platforms:watchos_i386
+    --cpu=watchos_i386
+
+  @build_bazel_apple_support//platforms:watchos_x86_64
+    --cpu=watchos_x86_64
+
+  @build_bazel_apple_support//platforms:watchos_arm64
+    --cpu=watchos_arm64
+
+  @build_bazel_apple_support//platforms:watchos_armv7k
+    --cpu=watchos_armv7k
+
+  @build_bazel_apple_support//platforms:watchos_arm64_32
+    --cpu=watchos_arm64_32
+
+flags:
+  --cpu=darwin_x86_64
+  --apple_platform_type=macos
+    @build_bazel_apple_support//platforms:macos_x86_64
+
+  --cpu=darwin_arm64
+  --apple_platform_type=macos
+    @build_bazel_apple_support//platforms:macos_arm64
+
+  --cpu=darwin_arm64e
+  --apple_platform_type=macos
+    @build_bazel_apple_support//platforms:darwin_arm64e
+
+  --cpu=ios_i386
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_i386
+
+  --cpu=ios_x86_64
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_x86_64
+
+  --cpu=ios_sim_arm64
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_sim_arm64
+
+  --cpu=ios_armv7
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_armv7
+
+  --cpu=ios_arm64
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_arm64
+
+  --cpu=ios_arm64e
+  --apple_platform_type=ios
+    @build_bazel_apple_support//platforms:ios_arm64e
+
+  --cpu=tvos_x86_64
+  --apple_platform_type=tvos
+    @build_bazel_apple_support//platforms:tvos_x86_64
+
+  --cpu=tvos_sim_arm64
+  --apple_platform_type=tvos
+    @build_bazel_apple_support//platforms:tvos_sim_arm64
+
+  --cpu=tvos_arm64
+  --apple_platform_type=tvos
+    @build_bazel_apple_support//platforms:tvos_arm64
+
+  --cpu=watchos_i386
+  --apple_platform_type=watchos
+    @build_bazel_apple_support//platforms:watchos_i386
+
+  --cpu=watchos_x86_64
+  --apple_platform_type=watchos
+    @build_bazel_apple_support//platforms:watchos_x86_64
+
+  --cpu=watchos_arm64
+  --apple_platform_type=watchos
+    @build_bazel_apple_support//platforms:watchos_arm64
+
+  --cpu=watchos_armv7k
+  --apple_platform_type=watchos
+    @build_bazel_apple_support//platforms:watchos_armv7k
+
+  --cpu=watchos_arm64_32
+  --apple_platform_type=watchos
+    @build_bazel_apple_support//platforms:watchos_arm64_32
diff --git a/platform_mappings_bzlmod b/platform_mappings_bzlmod
new file mode 100644
index 000000000..14d7e2fe4
--- /dev/null
+++ b/platform_mappings_bzlmod
@@ -0,0 +1,120 @@
+platforms:
+  @apple_support~1.9.0//platforms:macos_x86_64
+    --cpu=darwin_x86_64
+
+  @apple_support~1.9.0//platforms:macos_arm64
+    --cpu=darwin_arm64
+
+  @apple_support~1.9.0//platforms:darwin_arm64e
+    --cpu=darwin_arm64e
+
+  @apple_support~1.9.0//platforms:ios_i386
+    --cpu=ios_i386
+
+  @apple_support~1.9.0//platforms:ios_x86_64
+    --cpu=ios_x86_64
+
+  @apple_support~1.9.0//platforms:ios_sim_arm64
+    --cpu=ios_sim_arm64
+
+  @apple_support~1.9.0//platforms:ios_armv7
+    --cpu=ios_armv7
+
+  @apple_support~1.9.0//platforms:ios_arm64
+    --cpu=ios_arm64
+
+  @apple_support~1.9.0//platforms:ios_arm64e
+    --cpu=ios_arm64e
+
+  @apple_support~1.9.0//platforms:tvos_x86_64
+    --cpu=tvos_x86_64
+
+  @apple_support~1.9.0//platforms:tvos_sim_arm64
+    --cpu=tvos_sim_arm64
+
+  @apple_support~1.9.0//platforms:tvos_arm64
+    --cpu=tvos_arm64
+
+  @apple_support~1.9.0//platforms:watchos_i386
+    --cpu=watchos_i386
+
+  @apple_support~1.9.0//platforms:watchos_x86_64
+    --cpu=watchos_x86_64
+
+  @apple_support~1.9.0//platforms:watchos_arm64
+    --cpu=watchos_arm64
+
+  @apple_support~1.9.0//platforms:watchos_armv7k
+    --cpu=watchos_armv7k
+
+  @apple_support~1.9.0//platforms:watchos_arm64_32
+    --cpu=watchos_arm64_32
+
+flags:
+  --cpu=darwin_x86_64
+  --apple_platform_type=macos
+    @apple_support~1.9.0//platforms:macos_x86_64
+
+  --cpu=darwin_arm64
+  --apple_platform_type=macos
+    @apple_support~1.9.0//platforms:macos_arm64
+
+  --cpu=darwin_arm64e
+  --apple_platform_type=macos
+    @apple_support~1.9.0//platforms:darwin_arm64e
+
+  --cpu=ios_i386
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_i386
+
+  --cpu=ios_x86_64
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_x86_64
+
+  --cpu=ios_sim_arm64
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_sim_arm64
+
+  --cpu=ios_armv7
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_armv7
+
+  --cpu=ios_arm64
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_arm64
+
+  --cpu=ios_arm64e
+  --apple_platform_type=ios
+    @apple_support~1.9.0//platforms:ios_arm64e
+
+  --cpu=tvos_x86_64
+  --apple_platform_type=tvos
+    @apple_support~1.9.0//platforms:tvos_x86_64
+
+  --cpu=tvos_sim_arm64
+  --apple_platform_type=tvos
+    @apple_support~1.9.0//platforms:tvos_sim_arm64
+
+  --cpu=tvos_arm64
+  --apple_platform_type=tvos
+    @apple_support~1.9.0//platforms:tvos_arm64
+
+  --cpu=watchos_i386
+  --apple_platform_type=watchos
+    @apple_support~1.9.0//platforms:watchos_i386
+
+  --cpu=watchos_x86_64
+  --apple_platform_type=watchos
+    @apple_support~1.9.0//platforms:watchos_x86_64
+
+  --cpu=watchos_arm64
+  --apple_platform_type=watchos
+    @apple_support~1.9.0//platforms:watchos_arm64
+
+  --cpu=watchos_armv7k
+  --apple_platform_type=watchos
+    @apple_support~1.9.0//platforms:watchos_armv7k
+
+  --cpu=watchos_arm64_32
+  --apple_platform_type=watchos
+    @apple_support~1.9.0//platforms:watchos_arm64_32

From 0396ac7fe4783f5a2f4fb8a19ffb068571a256f7 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Thu, 7 Sep 2023 10:36:54 -0700
Subject: [PATCH 2/3] try this

---
 platform_mappings_bzlmod | 68 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/platform_mappings_bzlmod b/platform_mappings_bzlmod
index 14d7e2fe4..6e9b8aa6c 100644
--- a/platform_mappings_bzlmod
+++ b/platform_mappings_bzlmod
@@ -1,120 +1,120 @@
 platforms:
-  @apple_support~1.9.0//platforms:macos_x86_64
+  @@apple_support~1.9.0//platforms:macos_x86_64
     --cpu=darwin_x86_64
 
-  @apple_support~1.9.0//platforms:macos_arm64
+  @@apple_support~1.9.0//platforms:macos_arm64
     --cpu=darwin_arm64
 
-  @apple_support~1.9.0//platforms:darwin_arm64e
+  @@apple_support~1.9.0//platforms:darwin_arm64e
     --cpu=darwin_arm64e
 
-  @apple_support~1.9.0//platforms:ios_i386
+  @@apple_support~1.9.0//platforms:ios_i386
     --cpu=ios_i386
 
-  @apple_support~1.9.0//platforms:ios_x86_64
+  @@apple_support~1.9.0//platforms:ios_x86_64
     --cpu=ios_x86_64
 
-  @apple_support~1.9.0//platforms:ios_sim_arm64
+  @@apple_support~1.9.0//platforms:ios_sim_arm64
     --cpu=ios_sim_arm64
 
-  @apple_support~1.9.0//platforms:ios_armv7
+  @@apple_support~1.9.0//platforms:ios_armv7
     --cpu=ios_armv7
 
-  @apple_support~1.9.0//platforms:ios_arm64
+  @@apple_support~1.9.0//platforms:ios_arm64
     --cpu=ios_arm64
 
-  @apple_support~1.9.0//platforms:ios_arm64e
+  @@apple_support~1.9.0//platforms:ios_arm64e
     --cpu=ios_arm64e
 
-  @apple_support~1.9.0//platforms:tvos_x86_64
+  @@apple_support~1.9.0//platforms:tvos_x86_64
     --cpu=tvos_x86_64
 
-  @apple_support~1.9.0//platforms:tvos_sim_arm64
+  @@apple_support~1.9.0//platforms:tvos_sim_arm64
     --cpu=tvos_sim_arm64
 
-  @apple_support~1.9.0//platforms:tvos_arm64
+  @@apple_support~1.9.0//platforms:tvos_arm64
     --cpu=tvos_arm64
 
-  @apple_support~1.9.0//platforms:watchos_i386
+  @@apple_support~1.9.0//platforms:watchos_i386
     --cpu=watchos_i386
 
-  @apple_support~1.9.0//platforms:watchos_x86_64
+  @@apple_support~1.9.0//platforms:watchos_x86_64
     --cpu=watchos_x86_64
 
-  @apple_support~1.9.0//platforms:watchos_arm64
+  @@apple_support~1.9.0//platforms:watchos_arm64
     --cpu=watchos_arm64
 
-  @apple_support~1.9.0//platforms:watchos_armv7k
+  @@apple_support~1.9.0//platforms:watchos_armv7k
     --cpu=watchos_armv7k
 
-  @apple_support~1.9.0//platforms:watchos_arm64_32
+  @@apple_support~1.9.0//platforms:watchos_arm64_32
     --cpu=watchos_arm64_32
 
 flags:
   --cpu=darwin_x86_64
   --apple_platform_type=macos
-    @apple_support~1.9.0//platforms:macos_x86_64
+    @@apple_support~1.9.0//platforms:macos_x86_64
 
   --cpu=darwin_arm64
   --apple_platform_type=macos
-    @apple_support~1.9.0//platforms:macos_arm64
+    @@apple_support~1.9.0//platforms:macos_arm64
 
   --cpu=darwin_arm64e
   --apple_platform_type=macos
-    @apple_support~1.9.0//platforms:darwin_arm64e
+    @@apple_support~1.9.0//platforms:darwin_arm64e
 
   --cpu=ios_i386
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_i386
+    @@apple_support~1.9.0//platforms:ios_i386
 
   --cpu=ios_x86_64
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_x86_64
+    @@apple_support~1.9.0//platforms:ios_x86_64
 
   --cpu=ios_sim_arm64
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_sim_arm64
+    @@apple_support~1.9.0//platforms:ios_sim_arm64
 
   --cpu=ios_armv7
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_armv7
+    @@apple_support~1.9.0//platforms:ios_armv7
 
   --cpu=ios_arm64
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_arm64
+    @@apple_support~1.9.0//platforms:ios_arm64
 
   --cpu=ios_arm64e
   --apple_platform_type=ios
-    @apple_support~1.9.0//platforms:ios_arm64e
+    @@apple_support~1.9.0//platforms:ios_arm64e
 
   --cpu=tvos_x86_64
   --apple_platform_type=tvos
-    @apple_support~1.9.0//platforms:tvos_x86_64
+    @@apple_support~1.9.0//platforms:tvos_x86_64
 
   --cpu=tvos_sim_arm64
   --apple_platform_type=tvos
-    @apple_support~1.9.0//platforms:tvos_sim_arm64
+    @@apple_support~1.9.0//platforms:tvos_sim_arm64
 
   --cpu=tvos_arm64
   --apple_platform_type=tvos
-    @apple_support~1.9.0//platforms:tvos_arm64
+    @@apple_support~1.9.0//platforms:tvos_arm64
 
   --cpu=watchos_i386
   --apple_platform_type=watchos
-    @apple_support~1.9.0//platforms:watchos_i386
+    @@apple_support~1.9.0//platforms:watchos_i386
 
   --cpu=watchos_x86_64
   --apple_platform_type=watchos
-    @apple_support~1.9.0//platforms:watchos_x86_64
+    @@apple_support~1.9.0//platforms:watchos_x86_64
 
   --cpu=watchos_arm64
   --apple_platform_type=watchos
-    @apple_support~1.9.0//platforms:watchos_arm64
+    @@apple_support~1.9.0//platforms:watchos_arm64
 
   --cpu=watchos_armv7k
   --apple_platform_type=watchos
-    @apple_support~1.9.0//platforms:watchos_armv7k
+    @@apple_support~1.9.0//platforms:watchos_armv7k
 
   --cpu=watchos_arm64_32
   --apple_platform_type=watchos
-    @apple_support~1.9.0//platforms:watchos_arm64_32
+    @@apple_support~1.9.0//platforms:watchos_arm64_32

From 43e179e8be7c062ab851f6fd26d5a77b243043a3 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Thu, 7 Sep 2023 11:01:57 -0700
Subject: [PATCH 3/3] revert

---
 platform_mappings_bzlmod | 68 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/platform_mappings_bzlmod b/platform_mappings_bzlmod
index 6e9b8aa6c..14d7e2fe4 100644
--- a/platform_mappings_bzlmod
+++ b/platform_mappings_bzlmod
@@ -1,120 +1,120 @@
 platforms:
-  @@apple_support~1.9.0//platforms:macos_x86_64
+  @apple_support~1.9.0//platforms:macos_x86_64
     --cpu=darwin_x86_64
 
-  @@apple_support~1.9.0//platforms:macos_arm64
+  @apple_support~1.9.0//platforms:macos_arm64
     --cpu=darwin_arm64
 
-  @@apple_support~1.9.0//platforms:darwin_arm64e
+  @apple_support~1.9.0//platforms:darwin_arm64e
     --cpu=darwin_arm64e
 
-  @@apple_support~1.9.0//platforms:ios_i386
+  @apple_support~1.9.0//platforms:ios_i386
     --cpu=ios_i386
 
-  @@apple_support~1.9.0//platforms:ios_x86_64
+  @apple_support~1.9.0//platforms:ios_x86_64
     --cpu=ios_x86_64
 
-  @@apple_support~1.9.0//platforms:ios_sim_arm64
+  @apple_support~1.9.0//platforms:ios_sim_arm64
     --cpu=ios_sim_arm64
 
-  @@apple_support~1.9.0//platforms:ios_armv7
+  @apple_support~1.9.0//platforms:ios_armv7
     --cpu=ios_armv7
 
-  @@apple_support~1.9.0//platforms:ios_arm64
+  @apple_support~1.9.0//platforms:ios_arm64
     --cpu=ios_arm64
 
-  @@apple_support~1.9.0//platforms:ios_arm64e
+  @apple_support~1.9.0//platforms:ios_arm64e
     --cpu=ios_arm64e
 
-  @@apple_support~1.9.0//platforms:tvos_x86_64
+  @apple_support~1.9.0//platforms:tvos_x86_64
     --cpu=tvos_x86_64
 
-  @@apple_support~1.9.0//platforms:tvos_sim_arm64
+  @apple_support~1.9.0//platforms:tvos_sim_arm64
     --cpu=tvos_sim_arm64
 
-  @@apple_support~1.9.0//platforms:tvos_arm64
+  @apple_support~1.9.0//platforms:tvos_arm64
     --cpu=tvos_arm64
 
-  @@apple_support~1.9.0//platforms:watchos_i386
+  @apple_support~1.9.0//platforms:watchos_i386
     --cpu=watchos_i386
 
-  @@apple_support~1.9.0//platforms:watchos_x86_64
+  @apple_support~1.9.0//platforms:watchos_x86_64
     --cpu=watchos_x86_64
 
-  @@apple_support~1.9.0//platforms:watchos_arm64
+  @apple_support~1.9.0//platforms:watchos_arm64
     --cpu=watchos_arm64
 
-  @@apple_support~1.9.0//platforms:watchos_armv7k
+  @apple_support~1.9.0//platforms:watchos_armv7k
     --cpu=watchos_armv7k
 
-  @@apple_support~1.9.0//platforms:watchos_arm64_32
+  @apple_support~1.9.0//platforms:watchos_arm64_32
     --cpu=watchos_arm64_32
 
 flags:
   --cpu=darwin_x86_64
   --apple_platform_type=macos
-    @@apple_support~1.9.0//platforms:macos_x86_64
+    @apple_support~1.9.0//platforms:macos_x86_64
 
   --cpu=darwin_arm64
   --apple_platform_type=macos
-    @@apple_support~1.9.0//platforms:macos_arm64
+    @apple_support~1.9.0//platforms:macos_arm64
 
   --cpu=darwin_arm64e
   --apple_platform_type=macos
-    @@apple_support~1.9.0//platforms:darwin_arm64e
+    @apple_support~1.9.0//platforms:darwin_arm64e
 
   --cpu=ios_i386
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_i386
+    @apple_support~1.9.0//platforms:ios_i386
 
   --cpu=ios_x86_64
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_x86_64
+    @apple_support~1.9.0//platforms:ios_x86_64
 
   --cpu=ios_sim_arm64
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_sim_arm64
+    @apple_support~1.9.0//platforms:ios_sim_arm64
 
   --cpu=ios_armv7
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_armv7
+    @apple_support~1.9.0//platforms:ios_armv7
 
   --cpu=ios_arm64
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_arm64
+    @apple_support~1.9.0//platforms:ios_arm64
 
   --cpu=ios_arm64e
   --apple_platform_type=ios
-    @@apple_support~1.9.0//platforms:ios_arm64e
+    @apple_support~1.9.0//platforms:ios_arm64e
 
   --cpu=tvos_x86_64
   --apple_platform_type=tvos
-    @@apple_support~1.9.0//platforms:tvos_x86_64
+    @apple_support~1.9.0//platforms:tvos_x86_64
 
   --cpu=tvos_sim_arm64
   --apple_platform_type=tvos
-    @@apple_support~1.9.0//platforms:tvos_sim_arm64
+    @apple_support~1.9.0//platforms:tvos_sim_arm64
 
   --cpu=tvos_arm64
   --apple_platform_type=tvos
-    @@apple_support~1.9.0//platforms:tvos_arm64
+    @apple_support~1.9.0//platforms:tvos_arm64
 
   --cpu=watchos_i386
   --apple_platform_type=watchos
-    @@apple_support~1.9.0//platforms:watchos_i386
+    @apple_support~1.9.0//platforms:watchos_i386
 
   --cpu=watchos_x86_64
   --apple_platform_type=watchos
-    @@apple_support~1.9.0//platforms:watchos_x86_64
+    @apple_support~1.9.0//platforms:watchos_x86_64
 
   --cpu=watchos_arm64
   --apple_platform_type=watchos
-    @@apple_support~1.9.0//platforms:watchos_arm64
+    @apple_support~1.9.0//platforms:watchos_arm64
 
   --cpu=watchos_armv7k
   --apple_platform_type=watchos
-    @@apple_support~1.9.0//platforms:watchos_armv7k
+    @apple_support~1.9.0//platforms:watchos_armv7k
 
   --cpu=watchos_arm64_32
   --apple_platform_type=watchos
-    @@apple_support~1.9.0//platforms:watchos_arm64_32
+    @apple_support~1.9.0//platforms:watchos_arm64_32