Skip to content

Commit 9faa079

Browse files
committed
rename swift2java plugin to SwiftJavaPlugin
1 parent b430ff6 commit 9faa079

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ let package = Package(
106106

107107
// ==== Plugin for wrapping Java classes in Swift
108108
.plugin(
109-
name: "Java2SwiftPlugin",
109+
name: "SwiftJavaPlugin",
110110
targets: [
111-
"Java2SwiftPlugin"
111+
"SwiftJavaPlugin"
112112
]
113113
),
114114

@@ -271,7 +271,7 @@ let package = Package(
271271
),
272272

273273
.plugin(
274-
name: "Java2SwiftPlugin",
274+
name: "SwiftJavaPlugin",
275275
capability: .buildTool(),
276276
dependencies: [
277277
"SwiftJavaTool"

Plugins/Java2SwiftPlugin/Java2SwiftPlugin.swift renamed to Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import PackagePlugin
1818
fileprivate let SwiftJavaConfigFileName = "swift-java.config"
1919

2020
@main
21-
struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
21+
struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
2222

2323
var pluginName: String = "swift-java"
2424
var verbose: Bool = getEnvironmentBool("SWIFT_JAVA_VERBOSE")
@@ -27,7 +27,7 @@ struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
2727
log("Create build commands for target '\(target.name)'")
2828
guard let sourceModule = target.sourceModule else { return [] }
2929

30-
let executable = try context.tool(named: "Java2Swift").url
30+
let executable = try context.tool(named: "SwiftJavaTool").url
3131
var commands: [Command] = []
3232

3333
// Note: Target doesn't have a directoryURL counterpart to directory,
@@ -199,7 +199,7 @@ struct Java2SwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
199199
}
200200
}
201201

202-
extension Java2SwiftBuildToolPlugin {
202+
extension SwiftJavaBuildToolPlugin {
203203
func argumentsModuleName(sourceModule: Target) -> [String] {
204204
return [
205205
"--module-name", sourceModule.name

Samples/JavaDependencySampleApp/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ let package = Package(
7676
.swiftLanguageMode(.v5),
7777
],
7878
plugins: [
79-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
79+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
8080
]
8181
),
8282

@@ -96,7 +96,7 @@ let package = Package(
9696
],
9797
plugins: [
9898
// .plugin(name: "SwiftJavaBootstrapJavaPlugin", package: "swift-java"),
99-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
99+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
100100
]
101101
),
102102

Samples/JavaKitSampleApp/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ let package = Package(
7777
plugins: [
7878
.plugin(name: "JavaCompilerPlugin", package: "swift-java"),
7979
.plugin(name: "JExtractSwiftPlugin", package: "swift-java"),
80-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
80+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
8181
]
8282
),
8383
]

Samples/JavaProbablyPrime/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let package = Package(
3434
.swiftLanguageMode(.v5)
3535
],
3636
plugins: [
37-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
37+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
3838
]
3939
),
4040
]

Samples/JavaSieve/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ let package = Package(
5858
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
5959
],
6060
plugins: [
61-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
61+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
6262
]
6363
),
6464

@@ -75,7 +75,7 @@ let package = Package(
7575
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
7676
],
7777
plugins: [
78-
.plugin(name: "Java2SwiftPlugin", package: "swift-java"),
78+
.plugin(name: "SwiftJavaPlugin", package: "swift-java"),
7979
]
8080
),
8181
]

0 commit comments

Comments
 (0)