Make generated JSON coding key Sendable by kieran-osgood-shopify · Pull Request #87 · Shopify/checkout-kit

kieran-osgood-shopify · 2026-05-13T15:01:07Z

What changes are you making?

I needed to update the quick type generation so that the types for the JSON value, value, which is the JSON an any value property, does not use an any. it needs to code into a concrete type in order to be Swift 6 compatible so it can conform to sendable.
attribution changes are due to stale snapshots (need to fix CI for this check)
chore(protocol): refresh UCP snapshot (chore(protocol): refresh UCP snapshot #202) added attribution to the schema files without re-generating the files

How to test

Before you merge

Important

I've added tests to support my implementation
I have read and agree with the Contribution Guidelines
I have read and agree with the Code of Conduct
I've updated the relevant platform README (platforms/swift/README.md and/or platforms/android/README.md)

Releasing a new Swift version?

I have bumped the version in platforms/swift/ShopifyCheckoutKit.podspec
I have bumped the version in platforms/swift/Sources/ShopifyCheckoutKit/ShopifyCheckoutKit.swift
I have updated platforms/swift/CHANGELOG.md
I have updated the SwiftPM/CocoaPods version snippets in platforms/swift/README.md (major version only)

Releasing a new Android version?

I have bumped the versionName in platforms/android/lib/build.gradle
I have updated platforms/android/CHANGELOG.md
I have updated the Gradle/Maven version snippets in platforms/android/README.md

Tip

See the Contributing documentation for the full release process per platform.

kieran-osgood-shopify · 2026-05-13T15:01:18Z

Fix Swift 6 test target isolation #91 : 2 dependent PRs (#98 , #99 )
Align PassKit protocol abstractions with Swift 6 #90
Isolate wallet controllers to the main actor #89
#88 Continuation: Make AcceleratedCheckouts.Configuration Sendable #274
AC Storefront: GraphQL values Sendable #88
Make generated JSON coding key Sendable #87 👈 (View in Graphite)
Logger: NSLock guaranteed #86
ShopifyCheckoutKit.Configuration: NSLock guaranteed #85
UI: @MainActor isolated #84
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

github-actions · 2026-06-10T16:53:55Z

React Native — Coverage Report

Lines	Statements	Branches	Functions
	91.66% (319/348)	87.86% (181/206)	100% (82/82)

kieran-osgood-shopify · 2026-06-15T09:02:14Z

  ]);

-  await normalizeGeneratedFile(output);
+  await normalizeGeneratedFile(output, (source) => {


This bit is a bit ugly, to avoid it silently failing in future I added a SHA check withQUICKTYPE_23_2_6_SWIFT_JSON_HELPER_SHA256 so we can detect change concretely in future. Ideally quicktype will provide better swift 6 support in future

markmur · 2026-06-15T13:38:46Z

+    return `${source.slice(0, helperStart)}// MARK: - Encode/decode helpers
+
+public final class JSONNull: Codable, Hashable, Sendable {
+
+    public static func == (lhs: JSONNull, rhs: JSONNull) -> Bool {
+            return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+            hasher.combine(0)
+    }
+
+    public init() {}


This code living in a JS file feels brittle. Could this live as a .swift file that we can lint/format and read as a file here instead?

Agreed - I was being more accepting on the fact it exists in the generated models file so its all checked - but then its just duplicated unnecessarily

The script is updated now so that it replaces the code with a marker, and the code is actually just persistently stored in protocol/languages/swift/Sources/ShopifyCheckoutProtocol/JSONAny.swift

This was referenced May 13, 2026

UI: @MainActor isolated #84

Merged

ShopifyCheckoutKit.Configuration: NSLock guaranteed #85

Merged

Logger: NSLock guaranteed #86

Merged

kieran-osgood-shopify added the #gsd:50662 Rebase Checkout Kit on UCP label May 14, 2026

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 1ff7318 to 1b2c323 Compare June 10, 2026 16:53

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 019f4b8 to 08574c6 Compare June 10, 2026 16:53

kieran-osgood-shopify mentioned this pull request Jun 10, 2026

Fix remaining Swift 6 concurrency issues #273

Closed

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 1b2c323 to a9cef3b Compare June 11, 2026 08:54

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 08574c6 to 92ab70f Compare June 11, 2026 08:54

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from a9cef3b to 0690561 Compare June 11, 2026 09:33

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 92ab70f to 01e34a8 Compare June 11, 2026 09:33

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 0690561 to 29a0e02 Compare June 11, 2026 10:01

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 01e34a8 to 65f806c Compare June 11, 2026 10:01

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 29a0e02 to 673bb39 Compare June 11, 2026 10:23

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch 2 times, most recently from 5678177 to 679b65c Compare June 11, 2026 10:32

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 673bb39 to 29722dd Compare June 11, 2026 10:32

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 679b65c to d8af537 Compare June 11, 2026 13:08

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 29722dd to 7c8db7f Compare June 11, 2026 13:08

kieran-osgood-shopify marked this pull request as ready for review June 11, 2026 14:31

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from d8af537 to 4f87743 Compare June 12, 2026 10:58

kieran-osgood-shopify changed the base branch from graphite-base/87 to kieran-osgood/swift6/synchronous-logger-state June 12, 2026 10:58

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 4f87743 to 7392cb4 Compare June 12, 2026 12:54

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from db98f08 to 157151b Compare June 12, 2026 12:54

kieran-osgood-shopify commented Jun 12, 2026

View reviewed changes

Comment thread platforms/swift/.swiftformat Outdated

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 7392cb4 to e8efc29 Compare June 12, 2026 14:11

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 157151b to 488079a Compare June 12, 2026 14:11

kieran-osgood-shopify changed the base branch from kieran-osgood/swift6/synchronous-logger-state to graphite-base/87 June 12, 2026 15:22

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from e8efc29 to de91f40 Compare June 15, 2026 08:46

kieran-osgood-shopify force-pushed the graphite-base/87 branch from 488079a to 88ac844 Compare June 15, 2026 08:46

kieran-osgood-shopify changed the base branch from graphite-base/87 to kieran-osgood/swift6/synchronous-logger-state June 15, 2026 08:46

kieran-osgood-shopify commented Jun 15, 2026

View reviewed changes

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 88ac844 to 7000043 Compare June 15, 2026 13:17

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from de91f40 to 0fb8d20 Compare June 15, 2026 13:17

kieran-osgood-shopify added 2 commits June 15, 2026 13:34

Support checked Sendable configuration storage

d9d261f

Make OSLogger checked Sendable

1168aca

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch from 7000043 to 1168aca Compare June 15, 2026 13:34

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from 0fb8d20 to cc14713 Compare June 15, 2026 13:35

markmur reviewed Jun 15, 2026

View reviewed changes

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/synchronous-logger-state branch 2 times, most recently from 831d87b to c89f450 Compare June 15, 2026 13:49

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from cc14713 to f5f36ff Compare June 15, 2026 13:49

kieran-osgood-shopify changed the base branch from kieran-osgood/swift6/synchronous-logger-state to graphite-base/87 June 15, 2026 14:06

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from f5f36ff to accb183 Compare June 15, 2026 14:06

kieran-osgood-shopify force-pushed the graphite-base/87 branch from c89f450 to 1bf3275 Compare June 15, 2026 14:07

graphite-app Bot changed the base branch from graphite-base/87 to main June 15, 2026 14:07

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch 2 times, most recently from 9054752 to fffc774 Compare June 15, 2026 14:10

Make generated JSON helpers checked Sendable

1cb7220

kieran-osgood-shopify force-pushed the kieran-osgood/swift6/generated-model-sendable branch from fffc774 to 1cb7220 Compare June 15, 2026 14:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make generated JSON coding key Sendable#87

Make generated JSON coding key Sendable#87
kieran-osgood-shopify wants to merge 3 commits into
mainfrom
kieran-osgood/swift6/generated-model-sendable

kieran-osgood-shopify commented May 13, 2026 •

edited

Loading

Uh oh!

kieran-osgood-shopify commented May 13, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

Uh oh!

kieran-osgood-shopify Jun 15, 2026

Uh oh!

markmur Jun 15, 2026

Uh oh!

kieran-osgood-shopify Jun 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

kieran-osgood-shopify commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What changes are you making?

How to test

Before you merge

Uh oh!

kieran-osgood-shopify commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

React Native — Coverage Report

Uh oh!

Uh oh!

kieran-osgood-shopify Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

markmur Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

kieran-osgood-shopify Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kieran-osgood-shopify commented May 13, 2026 •

edited

Loading

kieran-osgood-shopify commented May 13, 2026 •

edited

Loading

github-actions Bot commented Jun 10, 2026 •

edited

Loading