Split SwiftProtobuf into SwiftProtobufCore & SwiftProtobufFoundationCompat

DevTools/LibraryVersions.py

@@ -19,7 +19,7 @@
 
 _PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 _PODSPEC_PATH = os.path.join(_PROJECT_ROOT, 'SwiftProtobuf.podspec')
-_VERSION_SWIFT_PATH = os.path.join(_PROJECT_ROOT, 'Sources/SwiftProtobuf/Version.swift')
+_VERSION_SWIFT_PATH = os.path.join(_PROJECT_ROOT, 'Sources/SwiftProtobufCore/Version.swift')
 
 def Fail(message):
   sys.stderr.write('Error: %s\n' % message)

Makefile

@@ -330,7 +330,7 @@ regenerate-library-protos: build ${PROTOC_GEN_SWIFT}
 	${GENERATE_SRCS} \
 		--tfiws_opt=FileNaming=DropPath \
 		--tfiws_opt=Visibility=Public \
-		--tfiws_out=Sources/SwiftProtobuf \
+		--tfiws_out=Sources/SwiftProtobufCore \
 		${LIBRARY_PROTOS}
 
 # Rebuild just the protos used by the plugin
@@ -411,7 +411,7 @@ Tests/protoc-gen-swiftTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT}
 # public protocol, struct, enum, or class name, as well as every
 # method or property defined in a public protocol, struct, or class.
 # It also gives us a large collection of Swift names.
-Protos/mined_words.txt: Sources/SwiftProtobuf/*.swift
+Protos/mined_words.txt: Sources/SwiftProtobufCore/*.swift
 	@echo Building $@
 	@cat $^ | \
 	grep -E '\b(public|func|var)\b' | \

Package.swift

@@ -36,9 +36,17 @@ let package = Package(
   ],
   targets: [
     .target(
-        name: "SwiftProtobuf",
+        name: "SwiftProtobufCore",
         exclude: ["CMakeLists.txt"]
     ),
+    .target(
+        name: "SwiftProtobufFoundationCompat",
+        dependencies: ["SwiftProtobufCore"]
+    ),
+    .target(
+        name: "SwiftProtobuf",
+        dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]
+    ),
     .target(
         name: "SwiftProtobufPluginLibrary",
         dependencies: ["SwiftProtobuf"],
@@ -67,7 +75,7 @@ let package = Package(
     ),
     .testTarget(
         name: "SwiftProtobufTests",
-        dependencies: ["SwiftProtobuf"]
+        dependencies: ["SwiftProtobuf", "SwiftProtobufCore"]
     ),
     .testTarget(
         name: "SwiftProtobufPluginLibraryTests",

Package@swift-5.0.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Package@swift-5.1.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Package@swift-5.2.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Package@swift-5.3.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Package@swift-5.4.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Package@swift-5.5.swift

@@ -19,7 +19,11 @@ let package = Package(
     .library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
   ],
   targets: [
-    .target(name: "SwiftProtobuf"),
+    .target(name: "SwiftProtobufCore"),
+    .target(name: "SwiftProtobufFoundationCompat",
+            dependencies: ["SwiftProtobufCore"]),
+    .target(name: "SwiftProtobuf",
+            dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]),
     .target(name: "SwiftProtobufPluginLibrary",
             dependencies: ["SwiftProtobuf"]),
     .target(name: "SwiftProtobufTestHelpers",

Protos/generated_swift_names_enum_cases.proto

@@ -742,7 +742,7 @@ enum GeneratedSwiftReservedEnum {
   subVisitor = 735;
   Swift = 736;
   swiftPrefix = 737;
-  SwiftProtobuf = 738;
+  SwiftProtobufCore = 738;
   syntax = 739;
   T = 740;
   tag = 741;

Protos/generated_swift_names_enums.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedEnums {
   enum subVisitor { NONE_subVisitor = 0; }
   enum Swift { NONE_Swift = 0; }
   enum swiftPrefix { NONE_swiftPrefix = 0; }
-  enum SwiftProtobuf { NONE_SwiftProtobuf = 0; }
+  enum SwiftProtobufCore { NONE_SwiftProtobufCore = 0; }
   enum syntax { NONE_syntax = 0; }
   enum T { NONE_T = 0; }
   enum tag { NONE_tag = 0; }

Protos/generated_swift_names_fields.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedFields {
   int32 subVisitor = 735;
   int32 Swift = 736;
   int32 swiftPrefix = 737;
-  int32 SwiftProtobuf = 738;
+  int32 SwiftProtobufCore = 738;
   int32 syntax = 739;
   int32 T = 740;
   int32 tag = 741;

Protos/generated_swift_names_messages.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedMessages {
   message subVisitor { int32 subVisitor = 1; }
   message Swift { int32 Swift = 1; }
   message swiftPrefix { int32 swiftPrefix = 1; }
-  message SwiftProtobuf { int32 SwiftProtobuf = 1; }
+  message SwiftProtobufCore { int32 SwiftProtobufCore = 1; }
   message syntax { int32 syntax = 1; }
   message T { int32 T = 1; }
   message tag { int32 tag = 1; }

Reference/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.pb.swift

@@ -18,34 +18,34 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 import Foundation
-import SwiftProtobuf
+import SwiftProtobufCore
 
 // If the compiler emits an error on this type, it is because this file
 // was generated by a version of the `protoc` Swift plug-in that is
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
 /// Configuration used to define the mappings for generated proto files
 /// to the Swift module they will be included in.
 struct SwiftProtobuf_GenSwift_ModuleMappings {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The mappings.
   var mapping: [SwiftProtobuf_GenSwift_ModuleMappings.Entry] = []
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   /// Individual listing of the module name and the files that will go
   /// into it.
   struct Entry {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -59,7 +59,7 @@ struct SwiftProtobuf_GenSwift_ModuleMappings {
     /// or `path/to/file.proto`.
     var protoFilePath: [String] = []
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
   }
@@ -76,13 +76,13 @@ extension SwiftProtobuf_GenSwift_ModuleMappings.Entry: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "swift_protobuf.gen_swift"
 
-extension SwiftProtobuf_GenSwift_ModuleMappings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtobuf_GenSwift_ModuleMappings: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ModuleMappings"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "mapping"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -94,7 +94,7 @@ extension SwiftProtobuf_GenSwift_ModuleMappings: SwiftProtobuf.Message, SwiftPro
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.mapping.isEmpty {
       try visitor.visitRepeatedMessageField(value: self.mapping, fieldNumber: 1)
     }
@@ -108,14 +108,14 @@ extension SwiftProtobuf_GenSwift_ModuleMappings: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension SwiftProtobuf_GenSwift_ModuleMappings.Entry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtobuf_GenSwift_ModuleMappings.Entry: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtobuf_GenSwift_ModuleMappings.protoMessageName + ".Entry"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "module_name"),
     2: .standard(proto: "proto_file_path"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -128,7 +128,7 @@ extension SwiftProtobuf_GenSwift_ModuleMappings.Entry: SwiftProtobuf.Message, Sw
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.moduleName.isEmpty {
       try visitor.visitSingularStringField(value: self.moduleName, fieldNumber: 1)
     }