diff --git a/Package.swift b/Package.swift index 9f2aacf..a14302a 100644 --- a/Package.swift +++ b/Package.swift @@ -7,8 +7,14 @@ let package = Package( products: [ .library(name: "EasyDate", targets: ["EasyDate"]), ], + dependencies: [ + .package( + url: "https://github.com/EasyPackages/EasyCore.git", + .upToNextMajor(from: "0.0.1") + ) + ], targets: [ - .target(name: "EasyDate"), + .target(name: "EasyDate", dependencies: ["EasyCore"]), .testTarget( name: "EasyDateTests", dependencies: ["EasyDate"] diff --git a/Sources/EasyDate/DateFormatterExtensions.swift b/Sources/EasyDate/DateFormatterExtensions.swift index a43ca78..029cb32 100644 --- a/Sources/EasyDate/DateFormatterExtensions.swift +++ b/Sources/EasyDate/DateFormatterExtensions.swift @@ -4,6 +4,7 @@ // import Foundation +import EasyCore /// /// A collection of reusable and localized `DateFormatter` configurations. @@ -30,7 +31,7 @@ public extension DateFormatter { let f = DateFormatter() f.calendar = Calendar(identifier: .iso8601) f.timeZone = .gmt - f.locale = Locale(identifier: "en_US_POSIX") + f.locale = Locale.enUSPOSIX f.dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXXXX" return f } @@ -46,7 +47,7 @@ public extension DateFormatter { /// static var timestamp: DateFormatter { let f = DateFormatter() - f.locale = Locale(identifier: "en_US_POSIX") + f.locale = Locale.enUSPOSIX f.dateFormat = "yyyy-MM-dd HH:mm:ss" return f } diff --git a/Sources/EasyDate/StringExtensions.swift b/Sources/EasyDate/StringExtensions.swift index 88d79c3..b479cf9 100644 --- a/Sources/EasyDate/StringExtensions.swift +++ b/Sources/EasyDate/StringExtensions.swift @@ -106,7 +106,7 @@ public extension String { ] let formatter = DateFormatter() - formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.locale = Locale.enUSPOSIX formatter.timeZone = .gmt for format in formats { diff --git a/Tests/EasyDateTests/DateFormatterExtensionsTests.swift b/Tests/EasyDateTests/DateFormatterExtensionsTests.swift index da42d23..3bad580 100644 --- a/Tests/EasyDateTests/DateFormatterExtensionsTests.swift +++ b/Tests/EasyDateTests/DateFormatterExtensionsTests.swift @@ -1,5 +1,6 @@ import Testing import Foundation +import EasyCore @testable import EasyDate diff --git a/Tests/EasyDateTests/LocaleExtensions.swift b/Tests/EasyDateTests/LocaleExtensions.swift deleted file mode 100644 index a2cc01c..0000000 --- a/Tests/EasyDateTests/LocaleExtensions.swift +++ /dev/null @@ -1,54 +0,0 @@ -import Foundation - -extension Locale { - static let zhCN = Locale(identifier: "zh_CN") - static let zhTW = Locale(identifier: "zh_TW") - static let enUS = Locale(identifier: "en_US") - static let enGB = Locale(identifier: "en_GB") - static let hiIN = Locale(identifier: "hi_IN") - static let esES = Locale(identifier: "es_ES") - static let esMX = Locale(identifier: "es_MX") - static let arEG = Locale(identifier: "ar_EG") - static let arSA = Locale(identifier: "ar_SA") - static let bnBD = Locale(identifier: "bn_BD") - static let bnIN = Locale(identifier: "bn_IN") - static let ptBR = Locale(identifier: "pt_BR") - static let ptPT = Locale(identifier: "pt_PT") - static let ruRU = Locale(identifier: "ru_RU") - static let jaJP = Locale(identifier: "ja_JP") - static let deDE = Locale(identifier: "de_DE") - static let jvID = Locale(identifier: "jv_ID") - static let koKR = Locale(identifier: "ko_KR") - static let frFR = Locale(identifier: "fr_FR") - static let frCA = Locale(identifier: "fr_CA") - static let trTR = Locale(identifier: "tr_TR") - static let viVN = Locale(identifier: "vi_VN") - static let itIT = Locale(identifier: "it_IT") - static let plPL = Locale(identifier: "pl_PL") - static let taIN = Locale(identifier: "ta_IN") - static let mrIN = Locale(identifier: "mr_IN") - static let teIN = Locale(identifier: "te_IN") - static let thTH = Locale(identifier: "th_TH") - static let guIN = Locale(identifier: "gu_IN") - static let urPK = Locale(identifier: "ur_PK") - static let urIN = Locale(identifier: "ur_IN") - static let paIN = Locale(identifier: "pa_IN") - static let faIR = Locale(identifier: "fa_IR") - static let roRO = Locale(identifier: "ro_RO") - static let ukUA = Locale(identifier: "uk_UA") - static let mlIN = Locale(identifier: "ml_IN") - static let knIN = Locale(identifier: "kn_IN") - static let myMM = Locale(identifier: "my_MM") - static let amET = Locale(identifier: "am_ET") - static let orIN = Locale(identifier: "or_IN") - static let azAZ = Locale(identifier: "az_AZ") - static let suID = Locale(identifier: "su_ID") - static let haNG = Locale(identifier: "ha_NG") - static let yoNG = Locale(identifier: "yo_NG") - static let neNP = Locale(identifier: "ne_NP") - static let siLK = Locale(identifier: "si_LK") - static let cebPH = Locale(identifier: "ceb_PH") - static let srRS = Locale(identifier: "sr_RS") - static let svSE = Locale(identifier: "sv_SE") - static let huHU = Locale(identifier: "hu_HU") -}