Skip to content

Commit d4cba58

Browse files
committed
remove config file argument from wrap-java
1 parent 8a7e607 commit d4cba58

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
218218
"--output-directory", context.pluginWorkDirectoryURL.path(percentEncoded: false),
219219
"--cp", javaClassFileURL.path(percentEncoded: false),
220220
"--swift-module", sourceModule.name,
221-
"--swift-prefix", "Java"
221+
"--swift-type-prefix", "Java"
222222
],
223223
inputFiles: [javaClassFileURL],
224224
outputFiles: [swiftJavaConfigURL]

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
171171
arguments += javaStdlibModules.flatMap { ["--depends-on", $0] }
172172

173173
if !outputSwiftFiles.isEmpty {
174-
arguments += [ configFile.path(percentEncoded: false) ]
175-
176174
let displayName = "Wrapping \(classes.count) Java classes in Swift target '\(sourceModule.name)'"
177175
log("Prepared: \(displayName)")
178176
commands += [

Sources/SwiftJavaTool/Commands/ConfigureCommand.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extension SwiftJava {
6060
}
6161

6262
@Option(help: "A prefix that will be added to the names of the Swift types")
63-
var swiftPrefix: String?
63+
var swiftTypePrefix: String?
6464
}
6565
}
6666

@@ -232,8 +232,8 @@ extension SwiftJava.ConfigureCommand {
232232
}
233233

234234
var swiftName = javaCanonicalName.defaultSwiftNameForJavaClass
235-
if let swiftPrefix {
236-
swiftName = "\(swiftPrefix)\(swiftName)"
235+
if let swiftTypePrefix {
236+
swiftName = "\(swiftTypePrefix)\(swiftName)"
237237
}
238238

239239
if let configuredSwiftName = configuration.classes![javaCanonicalName] {

0 commit comments

Comments
 (0)