Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ let javaIncludePath = "\(javaHome)/include"
let package = Package(
name: "JavaKit",
platforms: [
.macOS(.v13),
.iOS(.v13),
.tvOS(.v13),
.watchOS(.v6),
.macCatalyst(.v13),
.macOS(.v10_15)
],
products: [
// ==== JavaKit (i.e. calling Java directly Swift utilities)
Expand Down
6 changes: 1 addition & 5 deletions Samples/JavaProbablyPrime/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ import PackageDescription
let package = Package(
name: "JavaProbablyPrime",
platforms: [
.macOS(.v13),
.iOS(.v13),
.tvOS(.v13),
.watchOS(.v6),
.macCatalyst(.v13),
.macOS(.v10_15),
],

products: [
Expand Down
2 changes: 1 addition & 1 deletion Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ extension Swift2JavaTranslator {
let targetFilePath = [javaPackagePath, filename].joined(separator: PATH_SEPARATOR)
print("Writing '\(targetFilePath)'...", terminator: "")
try contents.write(
to: Foundation.URL(filePath: targetDirectory).appending(path: filename),
to: Foundation.URL(fileURLWithPath: targetDirectory).appendingPathComponent(filename),
atomically: true,
encoding: .utf8
)
Expand Down
8 changes: 4 additions & 4 deletions Sources/Java2Swift/JavaToSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct JavaToSwift: ParsableCommand {
if jarFile {
generationMode = .configuration(jarFile: input)
} else {
let config = try JavaTranslator.readConfiguration(from: URL(filePath: input))
let config = try JavaTranslator.readConfiguration(from: URL(fileURLWithPath: input))
generationMode = .classWrappers(config)
}

Expand All @@ -90,7 +90,7 @@ struct JavaToSwift: ParsableCommand {
let swiftModuleName = String(dependentConfig[..<equalLoc])
let configFileName = String(dependentConfig[afterEqual...])

let config = try JavaTranslator.readConfiguration(from: URL(filePath: configFileName))
let config = try JavaTranslator.readConfiguration(from: URL(fileURLWithPath: configFileName))

return (swiftModuleName, config)
}
Expand Down Expand Up @@ -218,7 +218,7 @@ struct JavaToSwift: ParsableCommand {

print("Writing \(description) to '\(filename)'...", terminator: "")
try contents.write(
to: Foundation.URL(filePath: outputDirectory).appending(path: filename),
to: Foundation.URL(fileURLWithPath: outputDirectory).appendingPathComponent(filename),
atomically: true,
encoding: .utf8
)
Expand All @@ -242,7 +242,7 @@ struct JavaToSwift: ParsableCommand {
// If any of the segments of the Java name start with a number, it's a
// local class that cannot be mapped into Swift.
for segment in entry.getName().split(separator: "$") {
if segment.starts(with: /\d/) {
if let firstChar = segment.first, firstChar.isNumber {
continue
}
}
Expand Down
5 changes: 5 additions & 0 deletions Sources/Java2SwiftLib/StringExtras.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,9 @@ extension String {

return "`\(self)`"
}

/// Replace all occurrences of one character in the string with another.
public func replacing(_ character: Character, with replacement: Character) -> String {
return replacingOccurrences(of: String(character), with: String(replacement))
}
}
Loading