Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renamed JSONSafeEncoder to JSONSafeEncoding #329

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Renamed JSONSafeEncoder to JSONSafeEncoding #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcc6da0
Rename JSONSafeEncoder to JSONSafeEncoding
bsneed Apr 19, 2024
0c5365f
Update package; Bump tvOS to 13.0
bsneed Apr 19, 2024
ab8b6e5
Updated release scripts.
bsneed Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
],
Expand All @@ -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.
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Sources/Segment/Configuration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Foundation
import JSONSafeEncoder
import JSONSafeEncoding
#if os(Linux)
import FoundationNetworking
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/Segment/ObjC/ObjCAnalytics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#if !os(Linux)

import Foundation
import JSONSafeEncoder
import JSONSafeEncoding

// MARK: - ObjC Compatibility

Expand Down
2 changes: 1 addition & 1 deletion Sources/Segment/ObjC/ObjCConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#if !os(Linux)

import Foundation
import JSONSafeEncoder
import JSONSafeEncoding

@objc(SEGConfiguration)
public class ObjCConfiguration: NSObject {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Segment/Utilities/JSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Foundation
import JSONSafeEncoder
import JSONSafeEncoding

extension JSONDecoder {
enum JSONDecodingError: Error {
Expand Down
1 change: 0 additions & 1 deletion Sources/Segment/Utilities/iso8601.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import Foundation
import JSONSafeEncoder

enum SegmentISO8601DateFormatter {
static let shared: ISO8601DateFormatter = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Segment-Tests/JSON_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import XCTest
import JSONSafeEncoder
import JSONSafeEncoding
@testable import Segment

struct Personal: Codable {
Expand Down
6 changes: 3 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
6 changes: 3 additions & 3 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading