Merge branch 'main' into pennig/calculate-output-groups

Signed-off-by: Karim Alweheshy <[email protected]>
MobileNativeFoundation · Jul 30, 2024 · 5c10273 · 5c10273
2 parents 9b32f69 + 0be7a7f
commit 5c10273
Show file tree

Hide file tree

Showing 51 changed files with 1,976 additions and 756 deletions.
diff --git a/.bcr/metadata.template.json b/.bcr/metadata.template.json
@@ -10,6 +10,11 @@
             "email": "[email protected]",
             "github": "BalestraPatrick",
             "name": "Patrick Balestra"
+        },
+        {
+            "email": "[email protected]",
+            "github": "luispadron",
+            "name": "Luis Padron"
         }
     ],
     "repository": [

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -11,6 +11,7 @@ bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(
     name = "rules_swift",
     version = "1.6.0",
+    max_compatibility_level = 2,
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
@@ -73,7 +74,7 @@ single_version_override(
 # For Stardoc
 single_version_override(
     module_name = "bazel_skylib",
-    version = "1.5.0",
+    version = "1.6.0",
 )
 
 apple_cc_configure = use_extension(

diff --git a/README.md b/README.md
@@ -53,6 +53,7 @@ the ruleset.
 
 ## Projects using rules_xcodeproj
 
+- amo
 - BazelPods
 - Cash App
 - Envoy Mobile
@@ -66,6 +67,7 @@ the ruleset.
 - [Slack](https://www.youtube.com/watch?v=wy3Q38VJ5uQ)
 - Snap
 - Spotify
+- Square
 - SwiftLint
 - Ten Ten
 - Tinder

diff --git a/distribution/release_notes_template.md b/distribution/release_notes_template.md
@@ -0,0 +1,96 @@
+## What’s Changed
+
+### Since %LAST_TAG%
+
+* TBD
+
+**Below are the changes that were in %LAST_TAG%.**
+
+### ⚠️ Breaking changes ⚠️
+
+* TBD
+
+### New
+
+* TBD
+
+### Adjusted
+
+* TBD
+
+### Fixed
+
+* TBD
+
+### Ruleset Development Changes
+
+* TBD
+
+### Full Changelog
+
+https://github.com/buildbuddy-io/rules_xcodeproj/compare/%LAST_MINOR_TAG%...%CURRENT_TAG%
+
+## Contributors
+
+* TBD
+
+## Bzlmod Snippet
+
+```starlark
+bazel_dep(name = "rules_xcodeproj", version = "%CURRENT_TAG%")
+```
+
+`release.tar.gz`’s `integrity`: `%INTEGRITY%`
+
+## Workspace Snippet
+
+Please use the release asset (`release.tar.gz`) from your Bazel `WORKSPACE` instead of GitHub's source asset to reduce download size and improve reproducibility.
+
+```starlark
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_xcodeproj",
+    integrity = "%INTEGRITY%",
+    url = "https://github.com/MobileNativeFoundation/rules_xcodeproj/releases/download/%CURRENT_TAG%/release.tar.gz",
+)
+
+load(
+    "@rules_xcodeproj//xcodeproj:repositories.bzl",
+    "xcodeproj_rules_dependencies",
+)
+
+xcodeproj_rules_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+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_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
+)
+
+swift_rules_extra_dependencies()
+
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
+
+apple_support_dependencies()
+```
diff --git a/docs/bazel.md b/docs/bazel.md
@@ -33,6 +33,7 @@ load("@rules_xcodeproj//xcodeproj:defs.bzl", "xcodeproj")
   - [`xcschemes.env_value`](#xcschemes.env_value)
   - [`xcschemes.pre_post_actions.build_script`](#xcschemes.pre_post_actions.build_script)
   - [`xcschemes.pre_post_actions.launch_script`](#xcschemes.pre_post_actions.launch_script)
+  - [`xcschemes.autogeneration_config`](#xcschemes.autogeneration_config)
 - [Custom Xcode schemes (Legacy generation mode)](#custom-xcode-schemes-legacy-generation-mode)
   - [`xcode_schemes.scheme`](#xcode_schemes.scheme)
   - [`xcode_schemes.build_action`](#xcode_schemes.build_action)

diff --git a/examples/integration/CommandLine/CommandLineToolLib/BUILD b/examples/integration/CommandLine/CommandLineToolLib/BUILD
@@ -27,13 +27,13 @@ cc_library(
     name = "private_lib",
     srcs = ["private_lib.c"],
     hdrs = ["private_lib.h"],
+    aspect_hints = ["@build_bazel_rules_swift//swift:auto_module"],
     copts = [
         # This isn't needed bty anything, it's to exercise an edge case in
         # `FilePath` detection.
         "-Ibazel-out",
         "-Iexternal",
     ],
-    tags = ["swift_module=_Lib"],
 )
 
 swift_library(
@@ -55,7 +55,7 @@ swift_library(
     visibility = ["//CommandLine/Tests:__subpackages__"],
     deps = [
         ":lib_impl",
-        "//CommandLine/swift_c_module",
+        "//CommandLine/swift_interop_hint:c_lib",
         "@examples_command_line_external//:ExternalFramework",
         "@examples_command_line_external//:Library",
     ],

diff --git a/examples/integration/CommandLine/CommandLineToolLib/lib.swift b/examples/integration/CommandLine/CommandLineToolLib/lib.swift
@@ -1,5 +1,5 @@
-@_implementationOnly import _Lib
 @_implementationOnly import _SwiftLib
+@_implementationOnly import CommandLine_CommandLineToolLib_private_lib
 import ExternalFramework
 import Foundation
 import ImportableLibrary

diff --git a/...egration/CommandLine/swift_c_module/BUILD → ...tion/CommandLine/swift_interop_hint/BUILD b/...egration/CommandLine/swift_c_module/BUILD → ...tion/CommandLine/swift_interop_hint/BUILD
@@ -1,4 +1,7 @@
-load("@build_bazel_rules_swift//swift:swift.bzl", "swift_c_module")
+load(
+    "@build_bazel_rules_swift//swift:swift_interop_hint.bzl",
+    "swift_interop_hint",
+)
 
 cc_library(
     name = "c_lib",
@@ -8,14 +11,12 @@ cc_library(
     hdrs = [
         "c_lib.h",
     ],
+    aspect_hints = [":c_lib_swift_interop"],
+    visibility = ["//CommandLine:__subpackages__"],
 )
 
-swift_c_module(
-    name = "swift_c_module",
+swift_interop_hint(
+    name = "c_lib_swift_interop",
     module_map = "c_lib.modulemap",
     module_name = "SwiftCModule",
-    visibility = ["//CommandLine:__subpackages__"],
-    deps = [
-        ":c_lib",
-    ],
 )
diff --git a/...ration/CommandLine/swift_c_module/c_lib.c → ...on/CommandLine/swift_interop_hint/c_lib.c b/...ration/CommandLine/swift_c_module/c_lib.c → ...on/CommandLine/swift_interop_hint/c_lib.c
diff --git a/...ration/CommandLine/swift_c_module/c_lib.h → ...on/CommandLine/swift_interop_hint/c_lib.h b/...ration/CommandLine/swift_c_module/c_lib.h → ...on/CommandLine/swift_interop_hint/c_lib.h
diff --git a/...ommandLine/swift_c_module/c_lib.modulemap → ...ndLine/swift_interop_hint/c_lib.modulemap b/...ommandLine/swift_c_module/c_lib.modulemap → ...ndLine/swift_interop_hint/c_lib.modulemap
diff --git a/examples/integration/GRPC/BUILD b/examples/integration/GRPC/BUILD
@@ -1,42 +1,34 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
-load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_grpc_library",
-    "swift_library",
-    "swift_proto_library",
-)
+load("@build_bazel_rules_swift//proto:proto.bzl", "swift_proto_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 proto_library(
     name = "echo_proto",
     srcs = ["echo.proto"],
 )
 
 swift_proto_library(
-    name = "echo_proto_swift",
-    deps = [":echo_proto"],
-)
-
-swift_grpc_library(
     name = "echo_client_services_swift",
-    srcs = [":echo_proto"],
-    flavor = "client",
-    deps = [":echo_proto_swift"],
+    compilers = [
+        "@build_bazel_rules_swift//proto/compilers:swift_client_proto",
+        "@build_bazel_rules_swift//proto/compilers:swift_proto",
+    ],
+    protos = [":echo_proto"],
 )
 
-swift_grpc_library(
+swift_proto_library(
     name = "echo_server_services_swift",
-    srcs = [":echo_proto"],
-    flavor = "server",
-    deps = [":echo_proto_swift"],
+    compilers = [
+        "@build_bazel_rules_swift//proto/compilers:swift_proto",
+        "@build_bazel_rules_swift//proto/compilers:swift_server_proto",
+    ],
+    protos = [":echo_proto"],
 )
 
 swift_library(
     name = "echo_server.library",
     srcs = ["server_main.swift"],
-    deps = [
-        ":echo_proto_swift",
-        ":echo_server_services_swift",
-    ],
+    deps = [":echo_server_services_swift"],
 )
 
 macos_command_line_application(

diff --git a/examples/integration/GRPC/client_main.swift b/examples/integration/GRPC/client_main.swift
@@ -17,7 +17,6 @@ import SwiftProtobuf
 import GRPC
 import NIOCore
 import NIOPosix
-import GRPC_echo_proto
 import GRPC_echo_client_services_swift
 
 @main

diff --git a/examples/integration/GRPC/server_main.swift b/examples/integration/GRPC/server_main.swift
@@ -16,7 +16,6 @@ import Dispatch
 import GRPC
 import NIOCore
 import NIOPosix
-import GRPC_echo_proto
 import GRPC_echo_server_services_swift
 
 /// Concrete implementation of the `EchoService` service definition.

diff --git a/examples/integration/MODULE.bazel b/examples/integration/MODULE.bazel
@@ -10,12 +10,12 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.5.1",
+    version = "3.6.0",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.0.0",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(name = "bazel_skylib", version = "1.5.0")

diff --git a/examples/integration/Proto/BUILD b/examples/integration/Proto/BUILD
@@ -1,9 +1,6 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
-load(
-    "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_library",
-    "swift_proto_library",
-)
+load("@build_bazel_rules_swift//proto:proto.bzl", "swift_proto_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 proto_library(
     name = "person_proto",
@@ -12,15 +9,14 @@ proto_library(
 
 swift_proto_library(
     name = "person_proto_swift",
-    deps = [":person_proto"],
+    module_name = "Proto_person_proto",
+    protos = [":person_proto"],
 )
 
 swift_library(
     name = "tool.library",
     srcs = ["main.swift"],
-    deps = [
-        ":person_proto_swift",
-    ],
+    deps = [":person_proto_swift"],
 )
 
 macos_command_line_application(

diff --git a/examples/integration/WORKSPACE b/examples/integration/WORKSPACE
@@ -1,8 +1,16 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 local_repository(
     name = "rules_xcodeproj",
     path = "../..",
 )
 
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "32eeb4ef33c708d9c9a4ee0fa8475322ef149dabc81884ddc3b50eb2efff7843",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/2.0.0/rules_swift.2.0.0.tar.gz",
+)
+
 load(
     "@rules_xcodeproj//xcodeproj:repositories.bzl",
     "xcodeproj_rules_dependencies",