Skip to content

Commit c57088c

Browse files
authored
Merge pull request #89 from DougGregor/package-lower-macos-version
Reduce package requirements down to macOS 10.15
2 parents 72f5116 + 9e72ab6 commit c57088c

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

Package.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ let javaIncludePath = "\(javaHome)/include"
4343
let package = Package(
4444
name: "JavaKit",
4545
platforms: [
46-
.macOS(.v13),
47-
.iOS(.v13),
48-
.tvOS(.v13),
49-
.watchOS(.v6),
50-
.macCatalyst(.v13),
46+
.macOS(.v10_15)
5147
],
5248
products: [
5349
// ==== JavaKit (i.e. calling Java directly Swift utilities)

Samples/JavaProbablyPrime/Package.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ import PackageDescription
77
let package = Package(
88
name: "JavaProbablyPrime",
99
platforms: [
10-
.macOS(.v13),
11-
.iOS(.v13),
12-
.tvOS(.v13),
13-
.watchOS(.v6),
14-
.macCatalyst(.v13),
10+
.macOS(.v10_15),
1511
],
1612

1713
products: [

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ extension Swift2JavaTranslator {
7878
let targetFilePath = [javaPackagePath, filename].joined(separator: PATH_SEPARATOR)
7979
print("Writing '\(targetFilePath)'...", terminator: "")
8080
try contents.write(
81-
to: Foundation.URL(filePath: targetDirectory).appending(path: filename),
81+
to: Foundation.URL(fileURLWithPath: targetDirectory).appendingPathComponent(filename),
8282
atomically: true,
8383
encoding: .utf8
8484
)

Sources/Java2Swift/JavaToSwift.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct JavaToSwift: ParsableCommand {
7575
if jarFile {
7676
generationMode = .configuration(jarFile: input)
7777
} else {
78-
let config = try JavaTranslator.readConfiguration(from: URL(filePath: input))
78+
let config = try JavaTranslator.readConfiguration(from: URL(fileURLWithPath: input))
7979
generationMode = .classWrappers(config)
8080
}
8181

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

93-
let config = try JavaTranslator.readConfiguration(from: URL(filePath: configFileName))
93+
let config = try JavaTranslator.readConfiguration(from: URL(fileURLWithPath: configFileName))
9494

9595
return (swiftModuleName, config)
9696
}
@@ -218,7 +218,7 @@ struct JavaToSwift: ParsableCommand {
218218

219219
print("Writing \(description) to '\(filename)'...", terminator: "")
220220
try contents.write(
221-
to: Foundation.URL(filePath: outputDirectory).appending(path: filename),
221+
to: Foundation.URL(fileURLWithPath: outputDirectory).appendingPathComponent(filename),
222222
atomically: true,
223223
encoding: .utf8
224224
)
@@ -242,7 +242,7 @@ struct JavaToSwift: ParsableCommand {
242242
// If any of the segments of the Java name start with a number, it's a
243243
// local class that cannot be mapped into Swift.
244244
for segment in entry.getName().split(separator: "$") {
245-
if segment.starts(with: /\d/) {
245+
if let firstChar = segment.first, firstChar.isNumber {
246246
continue
247247
}
248248
}

Sources/Java2SwiftLib/StringExtras.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,9 @@ extension String {
3434

3535
return "`\(self)`"
3636
}
37+
38+
/// Replace all occurrences of one character in the string with another.
39+
public func replacing(_ character: Character, with replacement: Character) -> String {
40+
return replacingOccurrences(of: String(character), with: String(replacement))
41+
}
3742
}

0 commit comments

Comments
 (0)