Update references to SwiftProtobufCore to be SwiftProtobuf.

Makefile

@@ -318,7 +318,7 @@ regenerate-library-protos: build ${PROTOC_GEN_SWIFT}
 	${GENERATE_SRCS} \
 		--tfiws_opt=FileNaming=DropPath \
 		--tfiws_opt=Visibility=Public \
-		--tfiws_out=Sources/SwiftProtobufCore \
+		--tfiws_out=Sources/SwiftProtobuf \
 		${LIBRARY_PROTOS}
 
 # Rebuild just the protos used by the plugin
@@ -395,7 +395,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/SwiftProtobufCore/*.swift
+Protos/mined_words.txt: Sources/SwiftProtobuf/*.swift
 	@echo Building $@
 	@cat $^ | \
 	grep -E '\b(public|func|var)\b' | \
@@ -522,9 +522,8 @@ test-conformance: build check-for-protobuf-checkout Sources/Conformance/failure_
 	  --text_format_failure_list Sources/Conformance/text_format_failure_list_swift.txt\
 	  $(SWIFT_CONFORMANCE_PLUGIN)
 
-# Validate the CocoaPods podspecs files against the current tree state.
+# Validate the CocoaPods podspec file against the current tree state.
 pod-lib-lint:
 	@if [ `uname -s` = "Darwin" ] ; then \
-	  pod lib lint SwiftProtobufCore.podspec ; \
-	  pod lib lint '--include-podspecs=SwiftProtobufCore.podspec' SwiftProtobuf.podspec ; \
+	  pod lib lint SwiftProtobuf.podspec ; \
 	fi

Package.swift

@@ -35,13 +35,9 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
   ],
   targets: [
-    .target(
-        name: "SwiftProtobufCore",
-        exclude: ["CMakeLists.txt"]
-    ),
     .target(
         name: "SwiftProtobuf",
-        dependencies: ["SwiftProtobufCore"]
+        exclude: ["CMakeLists.txt"]
     ),
     .target(
         name: "SwiftProtobufPluginLibrary",
@@ -71,7 +67,7 @@ let package = Package(
     ),
     .testTarget(
         name: "SwiftProtobufTests",
-        dependencies: ["SwiftProtobuf", "SwiftProtobufCore"]
+        dependencies: ["SwiftProtobuf"]
     ),
     .testTarget(
         name: "SwiftProtobufPluginLibraryTests",

Package@swift-5.4.swift

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

Package@swift-5.5.swift

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

Sources/SwiftProtobuf/CMakeLists.txt

@@ -92,7 +92,7 @@ install(TARGETS SwiftProtobuf
   RUNTIME DESTINATION bin)
 get_swift_host_arch(swift_arch)
 install(FILES
-  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobufCore.swiftdoc
-  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobufCore.swiftmodule
+  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobuf.swiftdoc
+  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobuf.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})
 set_property(GLOBAL APPEND PROPERTY Protobuf_EXPORTS SwiftProtobuf)

Sources/SwiftProtobuf/Docs.docc/API.md

@@ -13,7 +13,7 @@ They're collected here to make it easier to understand.
 ## Message API
 
 Messages in the input proto file generate Swift structs in the result.
-These structs conform to `SwiftProtobufCore.Message` and provide Swift properties for every
+These structs conform to `SwiftProtobuf.Message` and provide Swift properties for every
 field, basic information about the message, standard initializers, and
 serialization and deserialization methods.
 
@@ -38,13 +38,13 @@ in the library, and omits many details of the generated
 code that are intended purely for internal use by the library.)
 
 ```swift
-public struct Example: SwiftProtobufCore.Message {
+public struct Example: SwiftProtobuf.Message {
   // The generated struct carries constant properties reflecting
   // basic information about the message:
   public var protoMessageName: String {return "Example"}
 
   // Nested enum and message types are nested in the generated Swift
-  public enum E: SwiftProtobufCore.Enum { ... }
+  public enum E: SwiftProtobuf.Enum { ... }
 
   // A public property is created for each field in the proto.
   public var field1: Int32 { get set }
@@ -152,7 +152,7 @@ generator to emit a `struct IntMessage` to the generated Swift file.
 ## Enum API
 
 Proto enums are translated to Swift enums in a fairly straightforward manner.
-The resulting Swift enums conform to the `SwiftProtobufCore.Enum` protocol which extends
+The resulting Swift enums conform to the `SwiftProtobuf.Enum` protocol which extends
 `RawRepresentable` with a `RawValue` of `Int`.
 The generated Swift enum will have a case for each enum value in the proto file.
 
@@ -168,7 +168,7 @@ If deserialization encounters an unknown value:
 - For protobuf binary, the value is handled as an unknown field.
 
 ```swift
-public enum MyEnum: SwiftProtobufCore.Enum {
+public enum MyEnum: SwiftProtobuf.Enum {
     public typealias RawValue = Int
 
     // Case for each value
@@ -280,14 +280,14 @@ Types in the proto file are mapped to Swift types as follows:
 
 Enums in the proto file generate Int-valued enums in the Swift code.
 
-Groups in the proto file generate Swift structs that conform to `SwiftProtobufCore.Message`.
+Groups in the proto file generate Swift structs that conform to `SwiftProtobuf.Message`.
 
 Messages in the proto file generate Swift structs that conform to
-`SwiftProtobufCore.Message`.
+`SwiftProtobuf.Message`.
 
-Note: There is also a `SwiftProtobufCore._MessageImplementationBase`
+Note: There is also a `SwiftProtobuf._MessageImplementationBase`
 protocol.  You should not refer to that directly; use
-`SwiftProtobufCore.Message` when you need to work with arbitrary groups or
+`SwiftProtobuf.Message` when you need to work with arbitrary groups or
 messages.
 
 ### Type modifiers
@@ -397,7 +397,7 @@ Also note that you can access the `alternatives` property here
 directly if you want to use a `switch` construct to analyze
 the fields contained in the oneof:
 ```swift
-public struct ExampleOneOf: SwiftProtobufCore.Message {
+public struct ExampleOneOf: SwiftProtobuf.Message {
    enum OneOf_Alternatives {
    case id(Int32)
    case name(String)
@@ -459,7 +459,7 @@ convenience methods.  The variations from the default generated behavior are des
 
 For most of these types, you should refer to Google's documentation.
 Details are provided here to explain details of how these are
-implemented by SwiftProtobufCore.
+implemented by SwiftProtobuf.
 
 ### Google_Protobuf_Value, Google_Protobuf_Struct, Google_Protobuf_ArrayValue
 

Sources/SwiftProtobuf/Enum.swift

@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 ///
-/// Generated enums conform to SwiftProtobufCore.Enum
+/// Generated enums conform to SwiftProtobuf.Enum
 ///
 /// See ProtobufTypes and JSONTypes for extension
 /// methods to support binary and JSON coding.

Sources/SwiftProtobuf/FieldTypes.swift

@@ -54,7 +54,7 @@ public protocol FieldType {
 public protocol MapKeyType: FieldType {
     /// A comparision function for where order is needed.  Can't use `Comparable`
     /// because `Bool` doesn't conform, and since it is `public` there is no way
-    /// to add a conformance internal to SwiftProtobufCore.
+    /// to add a conformance internal to SwiftProtobuf.
     static func _lessThan(lhs: BaseType, rhs: BaseType) -> Bool
 }
 

Sources/SwiftProtobuf/Message+BinaryAdditions_Data.swift

@@ -1,4 +1,4 @@
-// Sources/SwiftProtobufCore/Message+BinaryAdditions_Data.swift - Per-type binary coding
+// Sources/SwiftProtobuf/Message+BinaryAdditions_Data.swift - Per-type binary coding
 //
 // Copyright (c) 2022 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

Sources/SwiftProtobuf/Message+JSONAdditions_Data.swift

@@ -1,4 +1,4 @@
-// Sources/SwiftProtobufCore/Message+JSONAdditions_Data.swift - JSON format primitive types
+// Sources/SwiftProtobuf/Message+JSONAdditions_Data.swift - JSON format primitive types
 //
 // Copyright (c) 2022 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

Sources/SwiftProtobuf/Message+JSONArrayAdditions_Data.swift

@@ -1,4 +1,4 @@
-// Sources/SwiftProtobufCore/Message+JSONArrayAdditions_Data.swift - JSON format primitive types
+// Sources/SwiftProtobuf/Message+JSONArrayAdditions_Data.swift - JSON format primitive types
 //
 // Copyright (c) 2014 - 2017 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

Sources/SwiftProtobuf/Message.swift

@@ -175,9 +175,9 @@ extension Message {
 
 /// Implementation base for all messages; not intended for client use.
 ///
-/// In general, use `SwiftProtobufCore.Message` instead when you need a variable or
+/// In general, use `SwiftProtobuf.Message` instead when you need a variable or
 /// argument that can hold any type of message. Occasionally, you can use
-/// `SwiftProtobufCore.Message & Equatable` or `SwiftProtobufCore.Message & Hashable` as
+/// `SwiftProtobuf.Message & Equatable` or `SwiftProtobuf.Message & Hashable` as
 /// generic constraints if you need to write generic code that can be applied to
 /// multiple message types that uses equality tests, puts messages in a `Set`,
 /// or uses them as `Dictionary` keys.

Sources/SwiftProtobuf/SwiftProtobufContiguousBytes.swift

@@ -1,4 +1,4 @@
-// Sources/SwiftProtobufCore/SwiftProtobufContiguousBytes.swift
+// Sources/SwiftProtobuf/SwiftProtobufContiguousBytes.swift
 //
 // Copyright (c) 2022 Apple Inc. and the project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception

Sources/SwiftProtobufPluginLibrary/ProtoFileToModuleMappings.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 
-private let defaultSwiftProtobufModuleName = "SwiftProtobufCore"
+private let defaultSwiftProtobufModuleName = "SwiftProtobuf"
 
 /// Handles the mapping of proto files to the modules they will be compiled into.
 public struct ProtoFileToModuleMappings {

Tests/SwiftProtobufTests/Data+TestHelpers.swift

@@ -9,7 +9,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-@testable import SwiftProtobufCore
+@testable import SwiftProtobuf
 
 /// Helpers for building up wire encoding in tests.
 extension Data {

Tests/SwiftProtobufTests/TestHelpers.swift

@@ -14,7 +14,7 @@
 
 import XCTest
 import Foundation
-import SwiftProtobufCore
+import SwiftProtobuf
 
 typealias XCTestFileArgType = StaticString
 
@@ -22,7 +22,7 @@ protocol PBTestHelpers {
     associatedtype MessageTestType
 }
 
-extension PBTestHelpers where MessageTestType: SwiftProtobufCore.Message & Equatable {
+extension PBTestHelpers where MessageTestType: SwiftProtobuf.Message & Equatable {
 
     private func string(from data: [UInt8]) -> String {
         return "[" + data.map { String($0) }.joined(separator: ", ") + "]"
@@ -382,7 +382,7 @@ extension PBTestHelpers where MessageTestType: SwiftProtobufCore.Message & Equat
 }
 
 extension XCTestCase {
-    func assertDebugDescription(_ expected: String, _ m: SwiftProtobufCore.Message, fmt: String? = nil, file: XCTestFileArgType = #file, line: UInt = #line) {
+    func assertDebugDescription(_ expected: String, _ m: SwiftProtobuf.Message, fmt: String? = nil, file: XCTestFileArgType = #file, line: UInt = #line) {
         // `assertDebugDescription` is a no-op in release as `debugDescription` is unavailable.
         #if DEBUG
         let actual = m.debugDescription
@@ -392,7 +392,7 @@ extension XCTestCase {
     /// Like ``assertDebugDescription``, but only checks the the ``debugDescription`` ends with
     /// ``expectedSuffix``, mainly useful where you want to be agnotics to some preable like
     /// the module name.
-    func assertDebugDescriptionSuffix(_ expectedSuffix: String, _ m: SwiftProtobufCore.Message, fmt: String? = nil, file: XCTestFileArgType = #file, line: UInt = #line) {
+    func assertDebugDescriptionSuffix(_ expectedSuffix: String, _ m: SwiftProtobuf.Message, fmt: String? = nil, file: XCTestFileArgType = #file, line: UInt = #line) {
         // `assertDebugDescriptionSuffix` is a no-op in release as `debugDescription` is unavailable.
 #if DEBUG
         let actual = m.debugDescription

Tests/SwiftProtobufTests/Test_AllTypes.swift

@@ -16,7 +16,7 @@
 // -----------------------------------------------------------------------------
 
 import Foundation
-import SwiftProtobufCore
+import SwiftProtobuf
 import XCTest
 
 class Test_AllTypes: XCTestCase, PBTestHelpers {

Tests/SwiftProtobufTests/Test_Any.swift

@@ -17,7 +17,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Any: XCTestCase {
 
@@ -825,25 +825,25 @@ class Test_Any: XCTestCase {
 // generated code from ProtobufUnittest_TestEmptyMessage.
 
 struct ConflictingImportMessage:
-    SwiftProtobufCore.Message,
-    SwiftProtobufCore._MessageImplementationBase,
-    SwiftProtobufCore._ProtoNameProviding {
+    SwiftProtobuf.Message,
+    SwiftProtobuf._MessageImplementationBase,
+    SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = "protobuf_unittest_import.ImportMessage"
 
-  var unknownFields = SwiftProtobufCore.UnknownStorage()
+  var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 
-  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = SwiftProtobufCore._NameMap()
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = SwiftProtobuf._NameMap()
 
   static func ==(lhs: ConflictingImportMessage, rhs: ConflictingImportMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}

Tests/SwiftProtobufTests/Test_Api.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Api: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Google_Protobuf_Api

Tests/SwiftProtobufTests/Test_BinaryDecodingOptions.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_BinaryDecodingOptions: XCTestCase {
 

Tests/SwiftProtobufTests/Test_BinaryDelimited.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_BinaryDelimited: XCTestCase {
 

Tests/SwiftProtobufTests/Test_Conformance.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Conformance: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufTestMessages_Proto3_TestAllTypesProto3

Tests/SwiftProtobufTests/Test_Duration.swift

@@ -14,7 +14,7 @@
 // -----------------------------------------------------------------------------
 
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 import Foundation
 
 class Test_Duration: XCTestCase, PBTestHelpers {

Tests/SwiftProtobufTests/Test_Empty.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Empty: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Google_Protobuf_Empty

Tests/SwiftProtobufTests/Test_Enum.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Enum: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Proto3Unittest_TestAllTypes

Tests/SwiftProtobufTests/Test_Extensions.swift

@@ -14,13 +14,13 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // Exercise the support for Proto2 extensions.
 
 class Test_Extensions: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestAllExtensions
-    var extensions = SwiftProtobufCore.SimpleExtensionMap()
+    var extensions = SwiftProtobuf.SimpleExtensionMap()
 
     func assertEncode(_ expected: [UInt8], file: XCTestFileArgType = #file, line: UInt = #line, configure: (inout MessageTestType) -> Void) {
         let empty = MessageTestType()

Tests/SwiftProtobufTests/Test_FieldMask.swift

@@ -18,7 +18,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_FieldMask: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Google_Protobuf_FieldMask

Tests/SwiftProtobufTests/Test_JSON.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSON: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Proto3Unittest_TestAllTypes

Tests/SwiftProtobufTests/Test_JSONDecodingOptions.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSONDecodingOptions: XCTestCase {
 

Tests/SwiftProtobufTests/Test_JSONEncodingOptions.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSONEncodingOptions: XCTestCase {
   

Tests/SwiftProtobufTests/Test_JSON_Array.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSON_Array: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Proto3Unittest_TestAllTypes

Tests/SwiftProtobufTests/Test_JSON_Conformance.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSON_Conformance: XCTestCase {
     func assertEmptyDecode(_ json: String, file: XCTestFileArgType = #file, line: UInt = #line) -> () {

Tests/SwiftProtobufTests/Test_JSON_Extensions.swift

@@ -14,11 +14,11 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSON_Extensions: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestAllExtensions
-    var extensions = SwiftProtobufCore.SimpleExtensionMap()
+    var extensions = SwiftProtobuf.SimpleExtensionMap()
 
     override func setUp() {
         // Start with all the extensions from the unittest.proto file:

Tests/SwiftProtobufTests/Test_JSON_Performance.swift

@@ -13,7 +13,7 @@
 // -----------------------------------------------------------------------------
 
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_JSON_Performance: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Fuzz_Testing_Message

Tests/SwiftProtobufTests/Test_Map_JSON.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // TODO: Testing encoding needs some help, since the order of
 // entries isn't well-defined.

Tests/SwiftProtobufTests/Test_Merge.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Merge: XCTestCase, PBTestHelpers {
   typealias MessageTestType = Proto3Unittest_TestAllTypes

Tests/SwiftProtobufTests/Test_MessageSet.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-@testable import SwiftProtobufCore
+@testable import SwiftProtobuf
 
 extension ProtobufUnittest_RawMessageSet.Item {
   fileprivate init(typeID: Int, message: Data) {

Tests/SwiftProtobufTests/Test_Naming.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // In transforming some of the names in protos to Swift names, we do different
 // transforms, this test is mainly a compile test in that the code below calls

Tests/SwiftProtobufTests/Test_Required.swift

@@ -30,7 +30,7 @@
 import Foundation
 import XCTest
 
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Required: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestAllRequiredTypes

Tests/SwiftProtobufTests/Test_Reserved.swift

@@ -17,7 +17,7 @@
 
 import Foundation
 import XCTest
-@testable import SwiftProtobufCore
+@testable import SwiftProtobuf
 
 class Test_Reserved: XCTestCase {
     func testEnumNaming() {

Tests/SwiftProtobufTests/Test_SimpleExtensionMap.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-@testable import SwiftProtobufCore
+@testable import SwiftProtobuf
 
 extension AnyMessageExtension {
   // Support equality to simplify testing of getting the correct errors.

Tests/SwiftProtobufTests/Test_Struct.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Struct: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Google_Protobuf_Struct

Tests/SwiftProtobufTests/Test_TextFormatDecodingOptions.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormatDecodingOptions: XCTestCase {
 

Tests/SwiftProtobufTests/Test_TextFormat_Map_proto3.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_Map_proto3: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestMap

Tests/SwiftProtobufTests/Test_TextFormat_Performance.swift

@@ -13,7 +13,7 @@
 // -----------------------------------------------------------------------------
 
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_Performance: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Fuzz_Testing_Message

Tests/SwiftProtobufTests/Test_TextFormat_Unknown.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-@testable import SwiftProtobufCore
+@testable import SwiftProtobuf
 
 class Test_TextFormat_Unknown: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestEmptyMessage

Tests/SwiftProtobufTests/Test_TextFormat_WKT_proto3.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_WKT_proto3: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestWellKnownTypes

Tests/SwiftProtobufTests/Test_TextFormat_proto2.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_proto2: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestAllTypes

Tests/SwiftProtobufTests/Test_TextFormat_proto2_extensions.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_proto2_extensions: XCTestCase, PBTestHelpers {
     typealias MessageTestType = ProtobufUnittest_TestAllExtensions

Tests/SwiftProtobufTests/Test_TextFormat_proto3.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_TextFormat_proto3: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Proto3Unittest_TestAllTypes

Tests/SwiftProtobufTests/Test_Timestamp.swift

@@ -22,7 +22,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Timestamp: XCTestCase, PBTestHelpers {
     typealias MessageTestType = Google_Protobuf_Timestamp

Tests/SwiftProtobufTests/Test_Type.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // Since Type is purely compiled (there is no hand-coding
 // in it) this is a fairly thin test just to ensure that the proto

Tests/SwiftProtobufTests/Test_Unknown_proto2.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // Verify that unknown fields are correctly preserved by
 // proto2 messages.

Tests/SwiftProtobufTests/Test_Unknown_proto3.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 // Note: This uses the 'Proto3Arena' version of the empty message.
 // 'Arena' just indicates that this empty proto3 message

Tests/SwiftProtobufTests/Test_Wrappers.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import XCTest
-import SwiftProtobufCore
+import SwiftProtobuf
 
 class Test_Wrappers: XCTestCase {