fix: Use swift_interop_hint instead of swift_module tag (#1107)

brentleyjones · web-flow · commit 17d0419058af · 2024-07-10T16:41:21.000Z
Needed for rules_swift 2.0+. Only works with rules_swift 2.0+.

---------

Signed-off-by: Brentley Jones &lt;github@brentleyjones.com&gt;
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -23,12 +23,12 @@ bazel_dep(name = "platforms", version = "0.0.6")
 # rules_swift_package_manager _must_ be a runtime dependency of rules_swift_package_manager.
 bazel_dep(
     name = "rules_swift",
-    version = "1.16.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.1.1",
+    version = "3.6.0",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/bzlmod/workspace/Tests/MyLibraryTests/BUILD.bazel b/bzlmod/workspace/Tests/MyLibraryTests/BUILD.bazel
@@ -5,7 +5,6 @@ swift_test(
     name = "MyLibraryTests",
     srcs = [
         "MyLibraryTests.swift",
-        "main.swift",
     ],
     module_name = "MyLibraryTests",
     deps = ["//Sources/MyLibrary"],
diff --git a/bzlmod/workspace/Tests/MyLibraryTests/MyLibraryTests.swift b/bzlmod/workspace/Tests/MyLibraryTests/MyLibraryTests.swift
@@ -5,8 +5,4 @@ final class MyLibraryTests: XCTestCase {
     func testExample() throws {
         XCTAssertEqual(World().name, "World")
     }
-
-    static var allTests = [
-      ("testExample", testExample),
-    ]
 }
diff --git a/bzlmod/workspace/Tests/MyLibraryTests/main.swift b/bzlmod/workspace/Tests/MyLibraryTests/main.swift
diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel
@@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/examples/grpc_example/sources/test/BUILD.bazel b/examples/grpc_example/sources/test/BUILD.bazel
@@ -4,7 +4,6 @@ swift_test(
     name = "test",
     srcs = [
         "client_unit_test.swift",
-        "main.swift",
     ],
     module_name = "Test",
     deps = [
diff --git a/examples/grpc_example/sources/test/client_unit_test.swift b/examples/grpc_example/sources/test/client_unit_test.swift
@@ -29,9 +29,9 @@ public class EchoProvider: EchoService_EchoProvider {
   }
 
   public func echo(
-    request: EchoService_EchoRequest, 
-    context: StatusOnlyCallContext) 
-    -> EventLoopFuture<EchoService_EchoResponse> 
+    request: EchoService_EchoRequest,
+    context: StatusOnlyCallContext)
+    -> EventLoopFuture<EchoService_EchoResponse>
   {
     let response = EchoService_EchoResponse.with {
       $0.contents = request.contents
@@ -99,8 +99,4 @@ class ClientUnitTest: XCTestCase {
 
     self.wait(for: [completed], timeout: 10.0)
   }
-
-  static var allTests = [
-    ("testGetWithRealClientAndServer", testGetWithRealClientAndServer),
-  ]
 }
diff --git a/examples/grpc_example/sources/test/main.swift b/examples/grpc_example/sources/test/main.swift
diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel
@@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/examples/grpc_package_example/sources/test/BUILD.bazel b/examples/grpc_package_example/sources/test/BUILD.bazel
@@ -4,7 +4,6 @@ swift_test(
     name = "test",
     srcs = [
         "client_unit_test.swift",
-        "main.swift",
     ],
     module_name = "Test",
     deps = [
diff --git a/examples/grpc_package_example/sources/test/client_unit_test.swift b/examples/grpc_package_example/sources/test/client_unit_test.swift
@@ -27,9 +27,9 @@ public class EchoProvider: EchoService_EchoProvider {
   }
 
   public func echo(
-    request: EchoServiceServer.EchoService_EchoRequest, 
-    context: StatusOnlyCallContext) 
-    -> EventLoopFuture<EchoServiceServer.EchoService_EchoResponse> 
+    request: EchoServiceServer.EchoService_EchoRequest,
+    context: StatusOnlyCallContext)
+    -> EventLoopFuture<EchoServiceServer.EchoService_EchoResponse>
   {
     let response = EchoServiceServer.EchoService_EchoResponse.with {
       $0.contents = request.contents
@@ -97,8 +97,4 @@ class ClientUnitTest: XCTestCase {
 
     self.wait(for: [completed], timeout: 10.0)
   }
-
-  static var allTests = [
-    ("testGetWithRealClientAndServer", testGetWithRealClientAndServer),
-  ]
 }
diff --git a/examples/grpc_package_example/sources/test/main.swift b/examples/grpc_package_example/sources/test/main.swift
diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel
@@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel
@@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/examples/pkg_manifest_minimal/Tests/MyLibraryTests/BUILD.bazel b/examples/pkg_manifest_minimal/Tests/MyLibraryTests/BUILD.bazel
@@ -4,7 +4,6 @@ swift_test(
     name = "MyLibraryTests",
     srcs = [
         "MyLibraryTests.swift",
-        "main.swift",
     ],
     module_name = "MyLibraryTests",
     deps = ["//Sources/MyLibrary"],
diff --git a/examples/pkg_manifest_minimal/Tests/MyLibraryTests/main.swift b/examples/pkg_manifest_minimal/Tests/MyLibraryTests/main.swift
diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/soto_example/Tests/SotoTests/BUILD.bazel b/examples/soto_example/Tests/SotoTests/BUILD.bazel
@@ -4,7 +4,6 @@ swift_test(
     name = "SotoTests",
     srcs = [
         "SotoTests.swift",
-        "main.swift",
     ],
     module_name = "SotoTests",
     deps = ["@swiftpkg_soto//:SotoS3"],
diff --git a/examples/soto_example/Tests/SotoTests/SotoTests.swift b/examples/soto_example/Tests/SotoTests/SotoTests.swift
@@ -7,8 +7,4 @@ class SotoTests: XCTestCase {
         let createBucketRequest = S3.CreateBucketRequest(bucket: bucketName)
         XCTAssertEqual(createBucketRequest.bucket, bucketName)
     }
-
-    static var allTests = [
-        ("testSomething", testSomething),
-    ]
 }
diff --git a/examples/soto_example/Tests/SotoTests/main.swift b/examples/soto_example/Tests/SotoTests/main.swift
diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
diff --git a/examples/vapor_example/Tests/AppTests/AppTests.swift b/examples/vapor_example/Tests/AppTests/AppTests.swift
@@ -12,8 +12,4 @@ final class AppTests: XCTestCase {
             XCTAssertEqual(res.body.string, "Hello, Timmy!")
         })
     }
-
-    static var allTests = [
-      ("testHelloWorld", testHelloWorld),
-    ]
 }
diff --git a/examples/vapor_example/Tests/AppTests/BUILD.bazel b/examples/vapor_example/Tests/AppTests/BUILD.bazel
@@ -4,7 +4,6 @@ swift_test(
     name = "AppTests",
     srcs = [
         "AppTests.swift",
-        "main.swift",
     ],
     module_name = "AppTests",
     deps = [
diff --git a/examples/vapor_example/Tests/AppTests/main.swift b/examples/vapor_example/Tests/AppTests/main.swift
diff --git a/examples/vapor_example/WORKSPACE b/examples/vapor_example/WORKSPACE
@@ -48,8 +48,8 @@ gazelle_dependencies()
 
 http_archive(
     name = "build_bazel_rules_swift",
-    sha256 = "bb01097c7c7a1407f8ad49a1a0b1960655cf823c26ad2782d0b7d15b323838e2",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/1.18.0/rules_swift.1.18.0.tar.gz",
+    sha256 = "9919ed1d8dae509645bfd380537ae6501528d8de971caebed6d5185b9970dc4d",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/2.1.1/rules_swift.2.1.1.tar.gz",
 )
 
 load(
diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "apple_support", version = "1.15.1")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.1.1",
     repo_name = "build_bazel_rules_swift",
 )
 
diff --git a/swiftpkg/internal/pkginfo_targets.bzl b/swiftpkg/internal/pkginfo_targets.bzl
diff --git a/swiftpkg/internal/swiftpkg_build_files.bzl b/swiftpkg/internal/swiftpkg_build_files.bzl
diff --git a/swiftpkg/tests/swiftpkg_build_files_tests.bzl b/swiftpkg/tests/swiftpkg_build_files_tests.bzl
diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")`
`15`	`15`	`bazel_dep(name = "apple_support", version = "1.15.1")`
`16`	`16`	`bazel_dep(`
`17`	`17`	`name = "rules_swift",`
`18`		`- version = "1.18.0",`
	`18`	`+ version = "2.1.1",`
`19`	`19`	`repo_name = "build_bazel_rules_swift",`
`20`	`20`	`)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,4 @@ final class MyLibraryTests: XCTestCase {`
`5`	`5`	`func testExample() throws {`
`6`	`6`	`XCTAssertEqual(World().name, "World")`
`7`	`7`	`}`
`8`		`-`
`9`		`- static var allTests = [`
`10`		`- ("testExample", testExample),`
`11`		`- ]`
`12`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")`
`12`	`12`	`bazel_dep(name = "apple_support", version = "1.15.1")`
`13`	`13`	`bazel_dep(`
`14`	`14`	`name = "rules_swift",`
`15`		`- version = "1.18.0",`
	`15`	`+ version = "2.1.1",`
`16`	`16`	`repo_name = "build_bazel_rules_swift",`
`17`	`17`	`)`
`18`	`18`	`bazel_dep(`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")`
`19`	`19`	`bazel_dep(name = "apple_support", version = "1.15.1")`
`20`	`20`	`bazel_dep(`
`21`	`21`	`name = "rules_swift",`
`22`		`- version = "1.18.0",`
	`22`	`+ version = "2.1.1",`
`23`	`23`	`repo_name = "build_bazel_rules_swift",`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public class EchoProvider: EchoService_EchoProvider {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public func echo(`
`32`		`- request: EchoService_EchoRequest,`
`33`		`- context: StatusOnlyCallContext)`
`34`		`- -> EventLoopFuture<EchoService_EchoResponse>`
	`32`	`+ request: EchoService_EchoRequest,`
	`33`	`+ context: StatusOnlyCallContext)`
	`34`	`+ -> EventLoopFuture<EchoService_EchoResponse>`
`35`	`35`	`{`
`36`	`36`	`let response = EchoService_EchoResponse.with {`
`37`	`37`	`$0.contents = request.contents`
`@@ -99,8 +99,4 @@ class ClientUnitTest: XCTestCase {`
`99`	`99`
`100`	`100`	`self.wait(for: [completed], timeout: 10.0)`
`101`	`101`	`}`
`102`		`-`
`103`		`- static var allTests = [`
`104`		`- ("testGetWithRealClientAndServer", testGetWithRealClientAndServer),`
`105`		`- ]`
`106`	`102`	`}`