Skip to content

Commit 45ce407

Browse files
minimum supported Swift version is now 5.7; renamed some structs to clarify their intended purpose
1 parent d2df3d3 commit 45ce407

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Package.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
// swift-tools-version: 5.10
1+
// swift-tools-version: 5.7
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
55

66
let package = Package(
77
name: "swift-string-catalogs",
88
defaultLocalization: "en",
9+
platforms: [
10+
.macOS(.v13)
11+
],
912
products: [
1013
.library(
1114
name: "SwiftStringCatalogs",

Sources/swift-string-catalogs/StringCatalog.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct StringCatalog : Codable {
1313
public struct Entry : Codable {
1414
public let comment:String?
1515
public let extractionState:ExtractionState
16-
public let localizations:[String:Variations]?
16+
public let localizations:[String:Localization]?
1717

1818
public enum ExtractionState : String, Codable {
1919
case manual
@@ -39,21 +39,21 @@ public struct StringCatalog : Codable {
3939
self.value = value
4040
}
4141
}
42-
public struct Variations : Codable {
42+
public struct Localization : Codable {
4343
public let stringUnit:Unit?
44-
public let variations:Variation?
44+
public let variations:Variations?
4545
public let substitutions:[String:Substitution]?
4646

4747
public struct Substitution : Codable {
4848
let argNum:Int
4949
let formatSpecifier:String
50-
let variations:Variation
50+
let variations:Variations
5151

52-
public struct Variation : Codable {
52+
public struct Variations : Codable {
5353
public let plural:Plural?
5454
}
5555
}
56-
public struct Variation : Codable {
56+
public struct Variations : Codable {
5757
public let device:Device?
5858
public let plural:Plural?
5959
}
@@ -78,11 +78,11 @@ public struct StringCatalog : Codable {
7878
}
7979
}
8080
public struct RawVariations : Codable {
81-
public let variations:Variation?
81+
public let variations:Variations?
8282
public let stringUnit:Unit?
8383

84-
public struct Variation : Codable {
85-
public let plural:StringCatalog.Entry.Variations.Plural?
84+
public struct Variations : Codable {
85+
public let plural:StringCatalog.Entry.Localization.Plural?
8686
}
8787
}
8888
}

0 commit comments

Comments
 (0)