Skip to content

Commit 8145e9e

Browse files
authored
Renamed JSONSafeEncoder to JSONSafeEncoding (#329)
* Rename JSONSafeEncoder to JSONSafeEncoding * Update package; Bump tvOS to 13.0 * Updated release scripts.
1 parent 01d39d2 commit 8145e9e

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed

Diff for: Package.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"pins" : [
33
{
4-
"identity" : "jsonsafeencoder-swift",
4+
"identity" : "jsonsafeencoding-swift",
55
"kind" : "remoteSourceControl",
6-
"location" : "https://github.com/segmentio/jsonsafeencoder-swift.git",
6+
"location" : "https://github.com/segmentio/jsonsafeencoding-swift.git",
77
"state" : {
8-
"revision" : "75ad40f07d4e0b938e3afb80811244d6b7acd4ba",
9-
"version" : "1.0.0"
8+
"revision" : "13449de3474c97ca6b7a25b3288f188b7417b34a",
9+
"version" : "1.0.2"
1010
}
1111
},
1212
{

Diff for: Package.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
platforms: [
99
.macOS("10.15"),
1010
.iOS("13.0"),
11-
.tvOS("11.0"),
11+
.tvOS("13.0"),
1212
.watchOS("7.1"),
1313
.visionOS("1.0")
1414
],
@@ -22,7 +22,7 @@ let package = Package(
2222
// Dependencies declare other packages that this package depends on.
2323
// .package(url: /* package url */, from: "1.0.0"),
2424
.package(url: "https://github.com/segmentio/sovran-swift.git", from: "1.1.1"),
25-
.package(url: "https://github.com/segmentio/jsonsafeencoder-swift.git", from: "1.0.0")
25+
.package(url: "https://github.com/segmentio/jsonsafeencoding-swift.git", from: "1.0.2")
2626
],
2727
targets: [
2828
// 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(
3131
name: "Segment",
3232
dependencies: [
3333
.product(name: "Sovran", package: "sovran-swift"),
34-
.product(name: "JSONSafeEncoder", package: "jsonsafeencoder-swift")
34+
.product(name: "JSONSafeEncoding", package: "jsonsafeencoding-swift")
3535
],
3636
resources: [.process("Resources")]),
3737
.testTarget(

Diff for: Sources/Segment/Configuration.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import Foundation
9-
import JSONSafeEncoder
9+
import JSONSafeEncoding
1010
#if os(Linux)
1111
import FoundationNetworking
1212
#endif

Diff for: Sources/Segment/ObjC/ObjCAnalytics.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if !os(Linux)
99

1010
import Foundation
11-
import JSONSafeEncoder
11+
import JSONSafeEncoding
1212

1313
// MARK: - ObjC Compatibility
1414

Diff for: Sources/Segment/ObjC/ObjCConfiguration.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if !os(Linux)
99

1010
import Foundation
11-
import JSONSafeEncoder
11+
import JSONSafeEncoding
1212

1313
@objc(SEGConfiguration)
1414
public class ObjCConfiguration: NSObject {

Diff for: Sources/Segment/Utilities/JSON.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import Foundation
9-
import JSONSafeEncoder
9+
import JSONSafeEncoding
1010

1111
extension JSONDecoder {
1212
enum JSONDecodingError: Error {

Diff for: Sources/Segment/Utilities/iso8601.swift

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//
77

88
import Foundation
9-
import JSONSafeEncoder
109

1110
enum SegmentISO8601DateFormatter {
1211
static let shared: ISO8601DateFormatter = {

Diff for: Tests/Segment-Tests/JSON_Tests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
import XCTest
9-
import JSONSafeEncoder
9+
import JSONSafeEncoding
1010
@testable import Segment
1111

1212
struct Personal: Codable {

Diff for: build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ rm Segment.zip
1818
rm Sovran.zip
1919
rm Segment.sha256
2020
rm Sovran.sha256
21-
rm JSONSafeEncoder.zip
22-
rm JSONSafeEncoder.sha256
21+
rm JSONSafeEncoding.zip
22+
rm JSONSafeEncoding.sha256
2323

2424
echo "Building XCFrameworks ..."
2525

26-
swift create-xcframework --clean --platform ios --platform macos --platform maccatalyst --platform tvos --platform watchos --stack-evolution --zip Segment Sovran JSONSafeEncoder
26+
swift create-xcframework --clean --platform ios --platform macos --platform maccatalyst --platform tvos --platform watchos --stack-evolution --zip Segment Sovran JSONSafeEncoding
2727

2828
echo "Done."

Diff for: release.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ rm $tempFile
147147
gh release upload $newVersion ${PRODUCT_NAME}.zip
148148
gh release upload $newVersion ${PRODUCT_NAME}.sha256
149149

150-
# SPECIAL CASE: We need to upload Sovran and JSONSafeEncoder to save them time.
150+
# SPECIAL CASE: We need to upload Sovran and JSONSafeEncoding to save them time.
151151
gh release upload $newVersion Sovran.zip
152152
gh release upload $newVersion Sovran.sha256
153-
gh release upload $newVersion JSONSafeEncoder.zip
154-
gh release upload $newVersion JSONSafeEncoder.sha256
153+
gh release upload $newVersion JSONSafeEncoding.zip
154+
gh release upload $newVersion JSONSafeEncoding.sha256

0 commit comments

Comments
 (0)