Skip to content

Make generated JSON coding key Sendable #87

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

Draft
kieran-osgood-shopify wants to merge 1 commit into
base: kieran-osgood/swift6/synchronous-logger-state
Choose a base branch
from
+2 −1
Draft

Make generated JSON coding key Sendable #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
public let credential: CredentialClass?
/// Display information for this payment instrument. Each payment instrument schema defines
/// its specific display properties, as outlined by the payment handler.
public let display: [String: JSONAny]?

Check warning on line 912 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'display' of 'Sendable'-conforming struct 'PaymentSelectedPaymentInstrument' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// The unique identifier for the handler instance that produced this instrument. This
/// corresponds to the 'id' field in the Payment Handler definition.
public let handlerID: String
Expand Down Expand Up @@ -1428,7 +1428,7 @@

public struct CapabilityResponseSchema: Codable, Sendable {
/// Entity-specific configuration. Structure defined by each entity's schema.
public let config: [String: JSONAny]?

Check warning on line 1431 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'config' of 'Sendable'-conforming struct 'CapabilityResponseSchema' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// Unique identifier for this entity instance. Used to disambiguate when multiple instances
/// exist.
public let id: String?
Expand Down Expand Up @@ -1535,7 +1535,7 @@

public struct PaymentHandlerResponseSchema: Codable, Sendable {
/// Entity-specific configuration. Structure defined by each entity's schema.
public let config: [String: JSONAny]?

Check warning on line 1538 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'config' of 'Sendable'-conforming struct 'PaymentHandlerResponseSchema' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// Unique identifier for this entity instance. Used to disambiguate when multiple instances
/// exist.
public let id: String
Expand Down Expand Up @@ -1615,7 +1615,7 @@
public struct PaymentHandlerResponseSchemaAvailableInstrument: Codable, Sendable {
/// Constraints on this instrument type. Structure depends on instrument type and active
/// capabilities.
public let constraints: [String: JSONAny]?

Check warning on line 1618 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'constraints' of 'Sendable'-conforming struct 'PaymentHandlerResponseSchemaAvailableInstrument' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// The instrument type identifier (e.g., 'card', 'gift_card'). References an instrument
/// schema's type constant.
public let type: String
Expand Down Expand Up @@ -2031,7 +2031,7 @@
public struct AvailablePaymentInstrument: Codable, Sendable {
/// Constraints on this instrument type. Structure depends on instrument type and active
/// capabilities.
public let constraints: [String: JSONAny]?

Check warning on line 2034 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'constraints' of 'Sendable'-conforming struct 'AvailablePaymentInstrument' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// The instrument type identifier (e.g., 'card', 'gift_card'). References an instrument
/// schema's type constant.
public let type: String
Expand Down Expand Up @@ -2934,7 +2934,7 @@

public struct UCPOrderResponseSchemaService: Codable, Sendable {
/// Entity-specific configuration. Structure defined by each entity's schema.
public let config: [String: JSONAny]?

Check warning on line 2937 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'config' of 'Sendable'-conforming struct 'UCPOrderResponseSchemaService' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// Unique identifier for this entity instance. Used to disambiguate when multiple instances
/// exist.
public let id: String?
Expand Down Expand Up @@ -5218,7 +5218,7 @@
public let credential: CredentialClass?
/// Display information for this payment instrument. Each payment instrument schema defines
/// its specific display properties, as outlined by the payment handler.
public let display: [String: JSONAny]?

Check warning on line 5221 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'display' of 'Sendable'-conforming struct 'PaymentInstrument' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// The unique identifier for the handler instance that produced this instrument. This
/// corresponds to the 'id' field in the Payment Handler definition.
public let handlerID: String
Expand Down Expand Up @@ -6961,7 +6961,7 @@
public let credential: CredentialClass?
/// Display information for this payment instrument. Each payment instrument schema defines
/// its specific display properties, as outlined by the payment handler.
public let display: [String: JSONAny]?

Check warning on line 6964 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'display' of 'Sendable'-conforming struct 'PurpleSelectedPaymentInstrument' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// The unique identifier for the handler instance that produced this instrument. This
/// corresponds to the 'id' field in the Payment Handler definition.
public let handlerID: String
Expand Down Expand Up @@ -7125,7 +7125,7 @@

public struct CapabilityElement: Codable, Sendable {
/// Entity-specific configuration. Structure defined by each entity's schema.
public let config: [String: JSONAny]?

Check warning on line 7128 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'config' of 'Sendable'-conforming struct 'CapabilityElement' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// Unique identifier for this entity instance. Used to disambiguate when multiple instances
/// exist.
public let id: String?
Expand Down Expand Up @@ -7202,7 +7202,7 @@

public struct PaymentHandlerElement: Codable, Sendable {
/// Entity-specific configuration. Structure defined by each entity's schema.
public let config: [String: JSONAny]?

Check warning on line 7205 in platforms/swift/Sources/ShopifyCheckoutProtocol/Generated/Models.swift

View workflow job for this annotation

GitHub Actions / Swift / package-tests / Run Package Tests 

stored property 'config' of 'Sendable'-conforming struct 'PaymentHandlerElement' contains non-Sendable type 'JSONAny'; this is an error in the Swift 6 language mode
/// Unique identifier for this entity instance. Used to disambiguate when multiple instances
/// exist.
public let id: String
Expand Down Expand Up @@ -7651,7 +7651,7 @@
}
}

class JSONCodingKey: CodingKey {
final class JSONCodingKey: CodingKey, Sendable {
let key: String

required init?(intValue _: Int) {
Expand Down
1 change: 1 addition & 0 deletions protocol/scripts/generate_models.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ case "$LANG" in
sed -i '' -E \
-e 's/[[:<:]]Binding[[:>:]]/TokenBinding/g' \
-e 's/[[:<:]]ColorScheme[[:>:]]/EmbeddedColorScheme/g' \
-e 's/^class JSONCodingKey: CodingKey {/final class JSONCodingKey: CodingKey, Sendable {/' \
"${OUTPUT}"

prepend_license "swift" "${OUTPUT}"
Expand Down
Loading