Move to Mobile Native Foundation and rename to XCBBuildServiceProxyKit

brentleyjones · brentleyjones · commit 2efa41ebde52 · 2022-05-03T19:58:26.000-05:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,6 +1,6 @@
 alias(
-    name = "XCBBuildServiceProxy",
-    actual = "//Sources/XCBBuildServiceProxy",
+    name = "XCBBuildServiceProxyKit",
+    actual = "//Sources/XCBBuildServiceProxyKit",
     visibility = ["//visibility:public"],
 )
 
@@ -45,4 +45,3 @@ alias(
     actual = "//Sources/XCBProtocol_13_3",
     visibility = ["//visibility:public"],
 )
-
diff --git a/Docs/UPDATING.md b/Docs/UPDATING.md
@@ -36,7 +36,7 @@ The `XCBBuildService` lives here: `$(XCODE_DIR)/Contents/SharedFrameworks/XCBuil
 
 To debug `BazelXCBBuildService` while it is being used by Xcode, you will need to have two instances of Xcode running:
 
-- "Main" Xcode: An instance of Xcode that uses our XCBBuildServiceProxy. This version will be used to build and run your app.
+- "Main" Xcode: An instance of Xcode that uses our XCBBuildServiceProxyKit. This version will be used to build and run your app.
 - "Debugging" Xcode: An instance of Xcode that uses the original XCBBuildService shipped with Xcode. This version will be used to debug the "main" instance of Xcode.
 
 Getting two instances of Xcode going can be done a couple of ways:
diff --git a/Examples/.bazelversion b/Examples/.bazelversion
@@ -0,0 +1 @@
+3.6.0
diff --git a/Examples/BazelXCBBuildService/BUILD.bazel b/Examples/BazelXCBBuildService/BUILD.bazel
@@ -14,9 +14,9 @@ swift_library(
         ":build_event_stream_proto",
         "@com_github_apple_swift_log//:Logging",
         "@com_github_apple_swift_nio//:NIO",
-        "@com_github_target_xcbbuildserviceproxy//:XCBBuildServiceProxy",
-        "@com_github_target_xcbbuildserviceproxy//:XCBProtocol",
-        "@com_github_target_xcbbuildserviceproxy//:XCBProtocol_12_0",
+        "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:XCBBuildServiceProxyKit",
+        "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:XCBProtocol",
+        "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:XCBProtocol_12_0",
     ],
 )
 
diff --git a/Examples/BazelXCBBuildService/Package.swift b/Examples/BazelXCBBuildService/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.17.0"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.9.0"),
-        // XCBBuildServiceProxy lives up two levels from here
+        // XCBBuildServiceProxyKit lives up two levels from here
         .package(path: "../../"),
     ],
     targets: [
@@ -23,7 +23,7 @@ let package = Package(
                 "Logging",
                 "NIO",
                 "SwiftProtobuf",
-                "XCBBuildServiceProxy",
+                "XCBBuildServiceProxyKit",
                 "XCBProtocol",
                 "XCBProtocol_12_0",
             ],
diff --git a/Examples/BazelXCBBuildService/Sources/BazelBuild.swift b/Examples/BazelXCBBuildService/Sources/BazelBuild.swift
@@ -1,5 +1,5 @@
 import Foundation
-import XCBBuildServiceProxy
+import XCBBuildServiceProxyKit
 import XCBProtocol
 
 // swiftformat:disable braces
diff --git a/Examples/BazelXCBBuildService/Sources/RequestHandler.swift b/Examples/BazelXCBBuildService/Sources/RequestHandler.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Logging
 import NIO
-import XCBBuildServiceProxy
+import XCBBuildServiceProxyKit
 import XCBProtocol
 
 @_exported import XCBProtocol_12_0
diff --git a/Examples/BazelXCBBuildService/Sources/main.swift b/Examples/BazelXCBBuildService/Sources/main.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Logging
 import NIO
-import XCBBuildServiceProxy
+import XCBBuildServiceProxyKit
 
 LoggingSystem.bootstrap { label in
     var handler = StreamLogHandler.standardError(label: label)
diff --git a/Examples/WORKSPACE b/Examples/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "com_github_target_xcbbuildserviceproxy_examples")
+workspace(name = "com_github_mobilenativefoundation_xcbbuildserviceproxykit_examples")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -22,32 +22,47 @@ http_archive(
     url = "https://github.com/bazelbuild/rules_swift/releases/download/0.15.0/rules_swift.0.15.0.tar.gz",
 )
 
-load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
 
 apple_support_dependencies()
 
-load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
+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")
+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")
+load(
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
+)
 
 swift_rules_extra_dependencies()
 
 # Project dependencies
 
 local_repository(
-    name = "com_github_target_xcbbuildserviceproxy",
+    name = "com_github_mobilenativefoundation_xcbbuildserviceproxykit",
     path = "../",
 )
 
-load("@com_github_target_xcbbuildserviceproxy//:repositories.bzl", "xcbbuildserviceproxy_dependencies")
+load(
+    "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:repositories.bzl",
+    "xcbbuildserviceproxykit_dependencies",
+)
 
-xcbbuildserviceproxy_dependencies()
+xcbbuildserviceproxykit_dependencies()
 
 http_archive(
     name = "build_bazel_bazel",
diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 let package = Package(
-    name: "XCBBuildServiceProxy",
+    name: "XCBBuildServiceProxyKit",
     platforms: [.macOS(.v11)],
     products: [
         .library(name: "XCBProtocol", targets: ["XCBProtocol"]),
@@ -13,7 +13,7 @@ let package = Package(
         .library(name: "XCBProtocol_12_5", targets: ["XCBProtocol_12_5"]),
         .library(name: "XCBProtocol_13_0", targets: ["XCBProtocol_13_0"]),
         .library(name: "XCBProtocol_13_3", targets: ["XCBProtocol_13_3"]),
-        .library(name: "XCBBuildServiceProxy", targets: ["XCBBuildServiceProxy"]),
+        .library(name: "XCBBuildServiceProxyKit", targets: ["XCBBuildServiceProxyKit"]),
     ],
     dependencies: [
         // Make sure to update the versions used in the `repositories.bzl` file if you change them here
@@ -108,7 +108,7 @@ let package = Package(
             ]
         ),
         .target(
-            name: "XCBBuildServiceProxy",
+            name: "XCBBuildServiceProxyKit",
             dependencies: [
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "NIO", package: "swift-nio"),
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
-# XCBBuildServiceProxy
+# XCBBuildServiceProxyKit
 
-XCBBuildServiceProxy is a framework that enables you to write a proxy for Xcode's XCBBuildService, which enables you to extend or replace Xcode's build system.
+XCBBuildServiceProxyKit is a framework that enables you to write a proxy for
+Xcode's XCBBuildService, which enables you to extend or replace Xcode's build
+system.
 
 ## Usage
 
@@ -18,5 +20,7 @@ Check out [our guide](Docs/UPDATING.md).
 
 ## Recognition
 
-- [jerrymarino/xcbuildkit](https://github.com/jerrymarino/xcbuildkit) for initial inspiration
-- [a2/MessagePack.swift](https://github.com/a2/MessagePack.swift) for starting point of MessagePack parsing
+- [jerrymarino/xcbuildkit](https://github.com/jerrymarino/xcbuildkit) for
+  initial inspiration
+- [a2/MessagePack.swift](https://github.com/a2/MessagePack.swift) for starting
+  point of MessagePack parsing
diff --git a/Sources/XCBBuildServiceProxy/Logger.swift b/Sources/XCBBuildServiceProxy/Logger.swift
diff --git a/Sources/XCBBuildServiceProxyKit/BUILD.bazel b/Sources/XCBBuildServiceProxyKit/BUILD.bazel
@@ -1,9 +1,9 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 swift_library(
-    name = "XCBBuildServiceProxy",
+    name = "XCBBuildServiceProxyKit",
     srcs = glob(["**/*.swift"]),
-    module_name = "XCBBuildServiceProxy",
+    module_name = "XCBBuildServiceProxyKit",
     deps = [
         "//Sources/XCBProtocol",
         "@com_github_apple_swift_log//:Logging",
diff --git a/Sources/XCBBuildServiceProxyKit/BuildContext.swift b/Sources/XCBBuildServiceProxyKit/BuildContext.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Hybrid/HybridRPCRequestHandler.swift b/Sources/XCBBuildServiceProxyKit/Hybrid/HybridRPCRequestHandler.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Hybrid/HybridXCBBuildService.swift b/Sources/XCBBuildServiceProxyKit/Hybrid/HybridXCBBuildService.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Hybrid/HybridXCBBuildServiceRequestHandler.swift b/Sources/XCBBuildServiceProxyKit/Hybrid/HybridXCBBuildServiceRequestHandler.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Hybrid/ProxiedRPCRequestHandler.swift b/Sources/XCBBuildServiceProxyKit/Hybrid/ProxiedRPCRequestHandler.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Hybrid/XCBBuildService.swift b/Sources/XCBBuildServiceProxyKit/Hybrid/XCBBuildService.swift
diff --git a/Sources/XCBBuildServiceProxyKit/Logger.swift b/Sources/XCBBuildServiceProxyKit/Logger.swift
@@ -0,0 +1,3 @@
+import Logging
+
+let logger = Logger(label: "XCBBuildServiceProxyKit")
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "com_github_target_xcbbuildserviceproxy")
+workspace(name = "com_github_mobilenativefoundation_xcbbuildserviceproxykit")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -22,24 +22,39 @@ http_archive(
     url = "https://github.com/bazelbuild/rules_swift/releases/download/0.23.0/rules_swift.0.23.0.tar.gz",
 )
 
-load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
 
 apple_support_dependencies()
 
-load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
+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")
+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")
+load(
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
+)
 
 swift_rules_extra_dependencies()
 
 # Project dependencies
 
-load("@com_github_target_xcbbuildserviceproxy//:repositories.bzl", "xcbbuildserviceproxy_dependencies")
+load(
+    "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:repositories.bzl",
+    "xcbbuildserviceproxykit_dependencies",
+)
 
-xcbbuildserviceproxy_dependencies()
+xcbbuildserviceproxykit_dependencies()
diff --git a/repositories.bzl b/repositories.bzl
@@ -1,15 +1,17 @@
-"""Definitions for handling Bazel repositories used by the Swift rules."""
+"""Definitions for handling Bazel repositories used by the
+XCBBuildServiceProxyKit rules."""
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-# Make sure to update the versions used in the `Package.swift` file if you change them here
+# Make sure to update the versions used in the `Package.swift` file if you
+# change them here
 
-def xcbbuildserviceproxy_dependencies():
-    """Fetches repositories that are dependencies of `XCBBuildServiceProxy`."""
+def xcbbuildserviceproxykit_dependencies():
+    "Fetches repositories that are dependencies of `XCBBuildServiceProxyKit`."
     maybe(
         http_archive,
-        build_file = "@com_github_target_xcbbuildserviceproxy//:external/com_github_apple_swift_log.BUILD",
+        build_file = "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:external/com_github_apple_swift_log.BUILD",
         name = "com_github_apple_swift_log",
         sha256 = "de51662b35f47764b6e12e9f1d43e7de28f6dd64f05bc30a318cf978cf3bc473",
         strip_prefix = "swift-log-1.4.2",
@@ -20,7 +22,7 @@ def xcbbuildserviceproxy_dependencies():
 
     maybe(
         http_archive,
-        build_file = "@com_github_target_xcbbuildserviceproxy//:external/com_github_apple_swift_nio.BUILD",
+        build_file = "@com_github_mobilenativefoundation_xcbbuildserviceproxykit//:external/com_github_apple_swift_nio.BUILD",
         name = "com_github_apple_swift_nio",
         sha256 = "40b115e77e8af3ffbe84be344c30c0964763e318e1d3dfe0a80da0e2ae17d614",
         strip_prefix = "swift-nio-2.30.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`alias(`
`2`		`- name = "XCBBuildServiceProxy",`
`3`		`- actual = "//Sources/XCBBuildServiceProxy",`
	`2`	`+ name = "XCBBuildServiceProxyKit",`
	`3`	`+ actual = "//Sources/XCBBuildServiceProxyKit",`
`4`	`4`	`visibility = ["//visibility:public"],`
`5`	`5`	`)`
`6`	`6`
`@@ -45,4 +45,3 @@ alias(`
`45`	`45`	`actual = "//Sources/XCBProtocol_13_3",`
`46`	`46`	`visibility = ["//visibility:public"],`
`47`	`47`	`)`
`48`		`-`