address review feedback (shadowenv, CONTRIBUTING dev tooling, swift clean/build)

Author: kyle-schellen

.github/CONTRIBUTING.md

@@ -39,6 +39,17 @@ When in doubt about whether we will be interested in including a new feature, pl
 7. Ensure all checks (tests, lint) are passing in GitHub.
 8. Open a pull request with a detailed description of what is changing and why.
 
+### Dev tooling
+
+Shopify employees can use the root `dev.yml` from the repo root:
+
+```bash
+dev up
+dev check
+```
+
+Platform-scoped commands are available as `dev android <command>`, `dev swift <command>`, and `dev react-native <command>` (or `dev rn`). Protocol schema/model commands are available as `dev protocol <command>`. For cross-platform changes, use `dev lint`, `dev test`, `dev check`, `dev format`, and `dev build`.
+
 ---
 
 ## Swift (`platforms/swift/`)

AGENTS.md

@@ -12,16 +12,24 @@ e2e/             # cross-platform end-to-end tests
 
 ## Dev workflow
 
+> **AI agents:** All commands require the `shadowenv exec --` prefix to run inside the shadowenv-managed environment.
+>
+> ```
+> shadowenv exec --dir <repo_root> -- /opt/dev/bin/dev up
+> shadowenv exec --dir <repo_root> -- /opt/dev/bin/dev test [ARGS]
+> ```
+
 Run `dev` commands from the repo root. Use `dev up` before running commands when
 the environment may not be provisioned.
 
 For platform-scoped work, prefer the root `dev.yml` commands:
 
 - Android: `dev android <command>`
 - Swift: `dev swift <command>`
-- Protocol: `dev protocol <command>`
 - React Native: `dev react-native <command>` or `dev rn <command>`
 
+For protocol schema/model work, use `dev protocol <command>`.
+
 For cross-platform changes, use the repo-wide aggregates: `dev lint`,
 `dev test`, `dev check`, `dev format`, and `dev build`. Use
 `dev <platform> format` for formatting; `fix` remains an alias for existing

README.md

@@ -27,17 +27,6 @@ Feature guides:
 - [Privacy compliance](https://shopify.dev/docs/storefronts/mobile/checkout-kit/privacy-compliance) - pass GDPR, CCPA, and ATT consent through to Shopify.
 - [Accelerated checkouts](https://shopify.dev/docs/storefronts/mobile/checkout-kit/accelerated-checkouts?extension=react-native) - Shop Pay and Apple Pay buttons for one-tap purchase on product and cart pages.
 
-## Development
-
-Shopify employees can use the root `dev.yml` from the repo root:
-
-```bash
-dev up
-dev check
-```
-
-Platform-scoped commands are available as `dev android <command>`, `dev swift <command>`, `dev protocol <command>`, and `dev react-native <command>` or `dev rn <command>`. For cross-platform changes, use `dev lint`, `dev test`, `dev check`, `dev format`, and `dev build`.
-
 ## Packages in this repo
 
 Checkout Kit is a monorepo containing all the platforms Checkout Kit supports together.

dev.yml

@@ -89,7 +89,6 @@ check:
   react-native-license-headers: cd platforms/react-native && ./scripts/copy_license --check
   web-lint: cd platforms/web && pnpm lint
   web-test: cd platforms/web && pnpm test
-  protocol-build: cd protocol/languages/swift && swift build
 
 commands:
   # Repo-wide
@@ -99,7 +98,6 @@ commands:
       set -e
       /opt/dev/bin/dev android build
       /opt/dev/bin/dev swift build
-      /opt/dev/bin/dev protocol build
       /opt/dev/bin/dev react-native build
 
   codegen:
@@ -135,7 +133,6 @@ commands:
       set -e
       /opt/dev/bin/dev android test
       /opt/dev/bin/dev swift test
-      /opt/dev/bin/dev protocol test
       /opt/dev/bin/dev react-native test
 
   apollo:
@@ -164,13 +161,13 @@ commands:
     desc: "Checkout protocol commands"
     subcommands:
       build:
-        desc: Build the Swift protocol package
+        desc: Build the Swift protocol target
         run: cd protocol/languages/swift && swift build
       test:
-        desc: Run Swift protocol package tests
-        run: cd protocol/languages/swift && swift test
+        desc: Build the Swift protocol test target
+        run: cd protocol/languages/swift && swift build --build-tests
       check:
-        desc: Build and test the Swift protocol package
+        desc: Build the Swift protocol target and test target
         run: |
           set -e
           /opt/dev/bin/dev protocol build
@@ -257,12 +254,34 @@ commands:
         aliases: [fix]
         run: cd platforms/swift && ./Scripts/lint fix
       clean:
-        desc: Clean Swift package build artifacts
-        run: cd platforms/swift && ./Scripts/xcode_run clean ShopifyCheckoutKit-Package
+        desc: Clean Swift packages and sample app build artifacts
+        run: |
+          set -e
+          cd platforms/swift
+          # ShopifyCheckoutKit-Package is the SPM-wide scheme: it cleans all
+          # library targets in Package.swift (ShopifyCheckoutKit,
+          # ShopifyAcceleratedCheckouts, ShopifyCheckoutProtocol) in one pass.
+          ./Scripts/xcode_run clean ShopifyCheckoutKit-Package
+          cd Samples
+          # Sample apps have a "Run Script" build phase that runs during clean
+          # and exits non-zero when there is nothing to delete. Tolerate it so
+          # the second sample still gets cleaned.
+          ../Scripts/xcode_run clean MobileBuyIntegration || true
+          ../Scripts/xcode_run clean ShopifyAcceleratedCheckoutsApp || true
       build:
-        desc: Build the Swift package
-        run: cd platforms/swift && ./Scripts/xcode_run build ShopifyCheckoutKit-Package
+        desc: Build all Swift packages and sample apps
+        run: |
+          set -e
+          cd platforms/swift
+          # ShopifyCheckoutKit-Package builds every library target in
+          # Package.swift in one xcodebuild invocation. The sample apps act as
+          # integration compilation checks against the built libraries.
+          ./Scripts/xcode_run build ShopifyCheckoutKit-Package
+          ./Scripts/build_samples
         subcommands:
+          packages:
+            desc: Build Swift package targets
+            run: cd platforms/swift && ./Scripts/xcode_run build ShopifyCheckoutKit-Package
           samples:
             desc: Build all sample applications to verify integration
             run: cd platforms/swift && ./Scripts/build_samples
@@ -364,13 +383,13 @@ commands:
             desc: Lint Swift code via SwiftLint
             run: cd platforms/react-native && ./scripts/lint_swift
           module:
-            desc: Lint the @shopify/checkout-sheet-kit module
+            desc: Lint the @shopify/checkout-kit-react-native module
             run: cd platforms/react-native && pnpm module lint
           sample:
             desc: Lint the sample app
             run: cd platforms/react-native && pnpm sample lint
       format:
-        desc: Auto-fix Swift lint and format issues
+        desc: Auto-format and apply safe lint autocorrections (Swift bridge only)
         aliases: [fix]
         run: cd platforms/react-native && ./scripts/lint_swift fix
       api:
@@ -401,6 +420,15 @@ commands:
             desc: Check React Native module license headers
             run: cd platforms/react-native && ./scripts/copy_license --check
 
+  rn:
+    desc: "Alias for React Native Checkout Kit commands"
+    long_desc: |
+      Alias for `dev react-native ...`. Use `dev help react-native` for the
+      full subcommand list.
+    syntax:
+      optional: "[command] [args]"
+    run: /opt/dev/bin/dev react-native "$@"
+
   # Web
   web:
     desc: "Web Checkout Kit commands"

platforms/android/scripts/check_license_headers.rb

@@ -4,7 +4,10 @@
 files = []
 
 Find.find('.') do |path|
-    next if path.include?('build/generated')
+    if File.directory?(path) && ['.gradle', 'build'].include?(File.basename(path))
+        Find.prune
+    end
+
     next unless File.file?(path) && path.end_with?('.kt')
 
     lines = File.readlines(path)

platforms/react-native/modules/@shopify/checkout-kit-react-native/ios/AcceleratedCheckoutButtons.swift

@@ -159,8 +159,8 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
         hostingController?.view.frame = bounds
     }
 
-    // Deprecated in iOS 17 — superseded by registerForTraitChanges in setupView().
-    // Remove this override when dropping iOS 16 support.
+    /// Deprecated in iOS 17 — superseded by registerForTraitChanges in setupView().
+    /// Remove this override when dropping iOS 16 support.
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         if #unavailable(iOS 17.0) {

platforms/react-native/sample/src/screens/SettingsScreen.tsx

@@ -361,7 +361,7 @@ function BuyerIdentityDetails({
       if (authenticated) {
         return (
           <View style={styles.sectionFooter}>
-            <Text style={[styles.sectionFooterText, {color: '#f5a623'}]}>
+            <Text style={[styles.sectionFooterText, styles.warningText]}>
               Changing Buyer Identity will log you out.
             </Text>
             <View style={styles.detailRow}>
@@ -449,6 +449,9 @@ function createStyles(colors: Colors) {
       fontSize: 12,
       color: colors.textSubdued,
     },
+    warningText: {
+      color: '#f5a623',
+    },
     detailRow: {
       flexDirection: 'row',
       alignItems: 'center',

platforms/react-native/scripts/lint_swift

@@ -2,6 +2,9 @@
 
 DIR=modules/@shopify/checkout-kit-react-native
 MODE="${1:-check}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel)"
+SWIFT_TOOLS_DIR="$REPO_ROOT/platforms/swift"
 
 # Validate the mode
 if [[ "$MODE" != "check" && "$MODE" != "fix" ]]; then
@@ -16,20 +19,33 @@ fi
 print_install_instructions() {
     echo "🔧 FIX:"
     echo "   Shopify employee? Run 'dev up'"
-    echo "   Not a Shopify employee? Install via homebrew:"
-    echo "     - SwiftLint: 'brew install swiftlint' / https://github.com/realm/SwiftLint"
-    echo "     - SwiftFormat: 'brew install swiftformat' / https://github.com/nicklockwood/SwiftFormat"
+    echo "   Not a Shopify employee? Install Mint and run 'mint bootstrap' from platforms/swift"
+    echo "   Homebrew also works: 'brew install swiftlint swiftformat'"
 }
 
-# Check for SwiftLint
-if ! which swiftlint >/dev/null; then
+resolve_tool() {
+    local command_name=$1
+
+    if which "$command_name" >/dev/null; then
+        which "$command_name"
+        return 0
+    fi
+
+    if command -v mint >/dev/null; then
+        (cd "$SWIFT_TOOLS_DIR" && mint which "$command_name")
+        return $?
+    fi
+
+    return 1
+}
+
+if ! SWIFTLINT="$(resolve_tool swiftlint)"; then
     echo "⚠️ WARN: SwiftLint not installed"
     print_install_instructions
     exit 1
 fi
 
-# Check for SwiftFormat
-if ! which swiftformat >/dev/null; then
+if ! SWIFTFORMAT="$(resolve_tool swiftformat)"; then
     echo "⚠️ WARN: SwiftFormat not installed"
     print_install_instructions
     exit 1
@@ -38,23 +54,23 @@ fi
 # Run SwiftLint
 if [[ "$MODE" == "check" ]]; then
     echo "🔄 Running SwiftLint in check mode..."
-    swiftlint lint --strict $DIR --config .swiftlint.yml
+    "$SWIFTLINT" lint --strict $DIR --config .swiftlint.yml
     LINT_STATUS=$?
 else
     echo "🔄 Running SwiftLint in fix mode..."
-    swiftlint lint --fix $DIR --config .swiftlint.yml
+    "$SWIFTLINT" lint --fix $DIR --config .swiftlint.yml
     LINT_STATUS=$?
 fi
 echo "SwiftLint exit status: $LINT_STATUS"
 
 # Run SwiftFormat
 if [[ "$MODE" == "check" ]]; then
     echo "🔄 Running SwiftFormat in check mode..."
-    swiftformat $DIR --lint --config .swiftformat
+    "$SWIFTFORMAT" $DIR --lint --config .swiftformat
     FORMAT_STATUS=$?
 else
     echo "🔄 Running SwiftFormat in fix mode..."
-    swiftformat $DIR --config .swiftformat
+    "$SWIFTFORMAT" $DIR --config .swiftformat
     FORMAT_STATUS=$?
 fi
 echo "SwiftFormat exit status: $FORMAT_STATUS"

platforms/swift/.cursor/rules/swift-development.mdc

@@ -26,7 +26,7 @@ alwaysApply: true
 Key commands for verification:
 - `dev swift lint` (alias: `dev swift style`) - Check format & lint issues
 - `dev swift format` - Auto-format and apply safe lint autocorrections
-- `dev swift build packages` - Build both packages
+- `dev swift build packages` - Build Swift package targets
 - `dev swift test` - Run all tests
 
 ## Concurrency Best Practices

platforms/swift/Scripts/lint

@@ -169,6 +169,7 @@ if [[ "$MODE" == "check" && "$SKIP_POD" == "false" ]]; then
 	# platforms/swift/ and protocol/languages/swift/. Run lint from the
 	# repo root.
 	REPO_ROOT="$(git -C "$(dirname "$0")" rev-parse --show-toplevel)"
+	export BUNDLE_GEMFILE="${BUNDLE_GEMFILE:-$REPO_ROOT/platforms/swift/Gemfile}"
 	POD_LOG=""
 	if [[ "$VERBOSE" == "true" ]]; then
 		(cd "$REPO_ROOT" && bundle exec pod lib lint ShopifyCheckoutKit.podspec --allow-warnings)
@@ -188,7 +189,7 @@ if [[ "$MODE" == "check" && "$SKIP_POD" == "false" ]]; then
 
 		echo "❌ CocoaPods lint exit status: $POD_STATUS"
 		echo "❌ CocoaPods detected issues that need to be fixed."
-		echo "🔧 Run 'bundle exec pod lib lint ShopifyCheckoutKit.podspec --allow-warnings --verbose' from the repo root for details"
+		echo "🔧 Run 'BUNDLE_GEMFILE=platforms/swift/Gemfile bundle exec pod lib lint ShopifyCheckoutKit.podspec --allow-warnings --verbose' from the repo root for details"
 		exit 1
 	fi