Skip to content

Commit 936b7b5

Browse files
kevintskevints
committed
Rename PluginLibrary module to SwiftProtobufPluginLibrary
Since Swift modules are exported into a global namespace, add a SwiftProtobuf prefix to PluginLibrary.
1 parent 753de0e commit 936b7b5

File tree

49 files changed

+86
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+86
-85
lines changed

‎DevTools/CollectTests.awk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BEGIN {
3838
printf("\n")
3939
printf("import XCTest\n")
4040
printf("@testable import SwiftProtobufTests\n")
41-
printf("@testable import PluginLibraryTests\n")
41+
printf("@testable import SwiftProtobufPluginLibraryTests\n")
4242
printf("\n")
4343
}
4444

‎Documentation/PLUGIN.md‎

Lines changed: 1 addition & 1 deletion

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ LIBRARY_PROTOS= \
157157
PLUGIN_PROTOS= \
158158
Protos/google/protobuf/compiler/plugin.proto \
159159
Protos/google/protobuf/descriptor.proto \
160-
Protos/PluginLibrary/swift_protobuf_module_mappings.proto
160+
Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
161161

162162
# Protos that are used by the conformance test runner.
163163
CONFORMANCE_PROTOS= \
@@ -372,7 +372,7 @@ regenerate: \
372372
regenerate-plugin-protos \
373373
regenerate-test-protos \
374374
regenerate-conformance-protos \
375-
Tests/PluginLibraryTests/DescriptorTestData.swift
375+
Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift
376376

377377
# Rebuild just the protos included in the runtime library
378378
regenerate-library-protos: build ${PROTOC_GEN_SWIFT}
@@ -387,7 +387,7 @@ regenerate-plugin-protos: build ${PROTOC_GEN_SWIFT}
387387
${GENERATE_SRCS} \
388388
--tfiws_opt=FileNaming=DropPath \
389389
--tfiws_opt=Visibility=Public \
390-
--tfiws_out=Sources/PluginLibrary \
390+
--tfiws_out=Sources/SwiftProtobufPluginLibrary \
391391
${PLUGIN_PROTOS}
392392

393393
# Rebuild just the protos used by the runtime test suite
@@ -400,7 +400,7 @@ regenerate-test-protos: build ${PROTOC_GEN_SWIFT} Protos/generated_swift_names_e
400400
--tfiws_out=Tests/SwiftProtobufTests \
401401
${TEST_PROTOS}
402402

403-
Tests/PluginLibraryTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT} ${SWIFT_DESCRIPTOR_TEST_PROTOS}
403+
Tests/SwiftProtobufPluginLibraryTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT} ${SWIFT_DESCRIPTOR_TEST_PROTOS}
404404
@${PROTOC} \
405405
--include_imports \
406406
--descriptor_set_out=DescriptorTestData.bin \

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import PackageDescription
1212
let package = Package(
1313
name: "SwiftProtobuf",
1414
targets: [
15-
Target(name: "PluginLibrary",
15+
Target(name: "SwiftProtobufPluginLibrary",
1616
dependencies: ["SwiftProtobuf"]),
1717
Target(name: "protoc-gen-swift",
18-
dependencies: ["PluginLibrary", "SwiftProtobuf"]),
18+
dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
1919
Target(name: "Conformance",
2020
dependencies: ["SwiftProtobuf"]),
2121
]

‎[email protected]‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ let package = Package(
1616
products: [
1717
.executable(name: "protoc-gen-swift", targets: ["protoc-gen-swift"]),
1818
.library(name: "SwiftProtobuf", type: .static, targets: ["SwiftProtobuf"]),
19-
.library(name: "SwiftProtobufPluginLibrary", targets: ["PluginLibrary"]),
19+
.library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
2020
],
2121
targets: [
2222
.target(name: "SwiftProtobuf"),
23-
.target(name: "PluginLibrary",
23+
.target(name: "SwiftProtobufPluginLibrary",
2424
dependencies: ["SwiftProtobuf"]),
2525
.target(name: "protoc-gen-swift",
26-
dependencies: ["PluginLibrary", "SwiftProtobuf"]),
26+
dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
2727
.target(name: "Conformance",
2828
dependencies: ["SwiftProtobuf"]),
2929
.testTarget(name: "SwiftProtobufTests",
3030
dependencies: ["SwiftProtobuf"]),
31-
.testTarget(name: "PluginLibraryTests",
32-
dependencies: ["PluginLibrary"]),
31+
.testTarget(name: "SwiftProtobufPluginLibraryTests",
32+
dependencies: ["SwiftProtobufPluginLibrary"]),
3333
],
3434
swiftLanguageVersions: [3, 4]
3535
)

Protos/PluginLibrary/swift_protobuf_module_mappings.proto renamed to Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Protos/PluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
1+
// Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
22
//
33
// This source file is part of the Swift.org open source project
44
//

‎Protos/pluginlib_descriptor_test.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
// -----------------------------------------------------------------------------
1212
///
13-
/// Test proto for Tests/PluginLibraryTests/Test_Descriptor.swift
13+
/// Test proto for Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift
1414
///
1515
// -----------------------------------------------------------------------------
1616

Reference/PluginLibrary/swift_protobuf_module_mappings.pb.swift renamed to Reference/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.pb.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// DO NOT EDIT.
22
//
33
// Generated by the Swift generator plugin for the protocol buffer compiler.
4-
// Source: PluginLibrary/swift_protobuf_module_mappings.proto
4+
// Source: SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto
55
//
66
// For information on using the generated types, please see the documenation:
77
// https://github.com/apple/swift-protobuf/
88

9-
// Protos/PluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
9+
// Protos/SwiftProtobufPluginLibrary/swift_protobuf_module_mappings.proto - Swift Module mappings configuration
1010
//
1111
// This source file is part of the Swift.org open source project
1212
//

‎Reference/pluginlib_descriptor_test.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//
1919
// -----------------------------------------------------------------------------
2020
///
21-
/// Test proto for Tests/PluginLibraryTests/Test_Descriptor.swift
21+
/// Test proto for Tests/SwiftProtobufPluginLibraryTests/Test_Descriptor.swift
2222
///
2323
// -----------------------------------------------------------------------------
2424

Sources/PluginLibrary/Array+Extensions.swift renamed to Sources/SwiftProtobufPluginLibrary/Array+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Sources/PluginLibrary/Array+Extensions.swift - Additions to Arrays
1+
// Sources/SwiftProtobufPluginLibrary/Array+Extensions.swift - Additions to Arrays
22
//
33
// Copyright (c) 2014 - 2017 Apple Inc. and the project authors
44
// Licensed under Apache License v2.0 with Runtime Library Exception

0 commit comments

Comments
 (0)