diff --git a/Package.resolved b/Package.resolved index 030ba0ba..14d8e571 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,12 +1,12 @@ { "pins" : [ { - "identity" : "jsonsafeencoder-swift", + "identity" : "jsonsafeencoding-swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/segmentio/jsonsafeencoder-swift.git", + "location" : "https://github.com/segmentio/jsonsafeencoding-swift.git", "state" : { - "revision" : "75ad40f07d4e0b938e3afb80811244d6b7acd4ba", - "version" : "1.0.0" + "revision" : "13449de3474c97ca6b7a25b3288f188b7417b34a", + "version" : "1.0.2" } }, { diff --git a/Package.swift b/Package.swift index aa355a83..c020fa15 100644 --- a/Package.swift +++ b/Package.swift @@ -8,7 +8,7 @@ let package = Package( platforms: [ .macOS("10.15"), .iOS("13.0"), - .tvOS("11.0"), + .tvOS("13.0"), .watchOS("7.1"), .visionOS("1.0") ], @@ -22,7 +22,7 @@ let package = Package( // Dependencies declare other packages that this package depends on. // .package(url: /* package url */, from: "1.0.0"), .package(url: "https://github.com/segmentio/sovran-swift.git", from: "1.1.1"), - .package(url: "https://github.com/segmentio/jsonsafeencoder-swift.git", from: "1.0.0") + .package(url: "https://github.com/segmentio/jsonsafeencoding-swift.git", from: "1.0.2") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -31,7 +31,7 @@ let package = Package( name: "Segment", dependencies: [ .product(name: "Sovran", package: "sovran-swift"), - .product(name: "JSONSafeEncoder", package: "jsonsafeencoder-swift") + .product(name: "JSONSafeEncoding", package: "jsonsafeencoding-swift") ], resources: [.process("Resources")]), .testTarget( diff --git a/Sources/Segment/Configuration.swift b/Sources/Segment/Configuration.swift index 15b9a004..0ae44ec4 100644 --- a/Sources/Segment/Configuration.swift +++ b/Sources/Segment/Configuration.swift @@ -6,7 +6,7 @@ // import Foundation -import JSONSafeEncoder +import JSONSafeEncoding #if os(Linux) import FoundationNetworking #endif diff --git a/Sources/Segment/ObjC/ObjCAnalytics.swift b/Sources/Segment/ObjC/ObjCAnalytics.swift index 93f32d4c..d5883ec0 100644 --- a/Sources/Segment/ObjC/ObjCAnalytics.swift +++ b/Sources/Segment/ObjC/ObjCAnalytics.swift @@ -8,7 +8,7 @@ #if !os(Linux) import Foundation -import JSONSafeEncoder +import JSONSafeEncoding // MARK: - ObjC Compatibility diff --git a/Sources/Segment/ObjC/ObjCConfiguration.swift b/Sources/Segment/ObjC/ObjCConfiguration.swift index 261e9da6..87117991 100644 --- a/Sources/Segment/ObjC/ObjCConfiguration.swift +++ b/Sources/Segment/ObjC/ObjCConfiguration.swift @@ -8,7 +8,7 @@ #if !os(Linux) import Foundation -import JSONSafeEncoder +import JSONSafeEncoding @objc(SEGConfiguration) public class ObjCConfiguration: NSObject { diff --git a/Sources/Segment/Utilities/JSON.swift b/Sources/Segment/Utilities/JSON.swift index fd8a79a0..510cc917 100644 --- a/Sources/Segment/Utilities/JSON.swift +++ b/Sources/Segment/Utilities/JSON.swift @@ -6,7 +6,7 @@ // import Foundation -import JSONSafeEncoder +import JSONSafeEncoding extension JSONDecoder { enum JSONDecodingError: Error { diff --git a/Sources/Segment/Utilities/iso8601.swift b/Sources/Segment/Utilities/iso8601.swift index 9a3fbb83..2b5feed8 100644 --- a/Sources/Segment/Utilities/iso8601.swift +++ b/Sources/Segment/Utilities/iso8601.swift @@ -6,7 +6,6 @@ // import Foundation -import JSONSafeEncoder enum SegmentISO8601DateFormatter { static let shared: ISO8601DateFormatter = { diff --git a/Tests/Segment-Tests/JSON_Tests.swift b/Tests/Segment-Tests/JSON_Tests.swift index fd744771..43f13cf9 100644 --- a/Tests/Segment-Tests/JSON_Tests.swift +++ b/Tests/Segment-Tests/JSON_Tests.swift @@ -6,7 +6,7 @@ // import XCTest -import JSONSafeEncoder +import JSONSafeEncoding @testable import Segment struct Personal: Codable { diff --git a/build.sh b/build.sh index d7184c19..e7d3602a 100755 --- a/build.sh +++ b/build.sh @@ -18,11 +18,11 @@ rm Segment.zip rm Sovran.zip rm Segment.sha256 rm Sovran.sha256 -rm JSONSafeEncoder.zip -rm JSONSafeEncoder.sha256 +rm JSONSafeEncoding.zip +rm JSONSafeEncoding.sha256 echo "Building XCFrameworks ..." -swift create-xcframework --clean --platform ios --platform macos --platform maccatalyst --platform tvos --platform watchos --stack-evolution --zip Segment Sovran JSONSafeEncoder +swift create-xcframework --clean --platform ios --platform macos --platform maccatalyst --platform tvos --platform watchos --stack-evolution --zip Segment Sovran JSONSafeEncoding echo "Done." \ No newline at end of file diff --git a/release.sh b/release.sh index 19877bd5..3bc204c2 100755 --- a/release.sh +++ b/release.sh @@ -147,8 +147,8 @@ rm $tempFile gh release upload $newVersion ${PRODUCT_NAME}.zip gh release upload $newVersion ${PRODUCT_NAME}.sha256 -# SPECIAL CASE: We need to upload Sovran and JSONSafeEncoder to save them time. +# SPECIAL CASE: We need to upload Sovran and JSONSafeEncoding to save them time. gh release upload $newVersion Sovran.zip gh release upload $newVersion Sovran.sha256 -gh release upload $newVersion JSONSafeEncoder.zip -gh release upload $newVersion JSONSafeEncoder.sha256 +gh release upload $newVersion JSONSafeEncoding.zip +gh release upload $newVersion JSONSafeEncoding.sha256