Sample / 0.74.1 → 0.75.5 (#269)

* 0.75.5

* Harden dependencies

* Fix lint error in sample

* Update CI step

* Add Android tools to AndroidManifest.template

* Run manifest generation

* Add timeouts to steps

* Improve cache key for cocoapods - include package.json and lockfile information

* Strip surrounding quotes on env value

Author: markmur

.github/actions/install-cocoapods/action.yml

@@ -1,28 +1,45 @@
 name: Cocoapods
 description: Install cocoapods for sample app
 
+inputs:
+  ruby-version:
+    description: 'Ruby version to use'
+    required: false
+    default: '3.1.2'
+
 runs:
   using: composite
   steps:
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
+      with:
+        bundler-cache: true
+        ruby-version: ${{ inputs.ruby-version }}
+        working-directory: sample
+
     - name: Cache cocoapods
       id: cache-cocoapods
       uses: actions/cache@v4
       with:
         path: |
           **/ios/Pods
-        key: ${{ runner.os }}-cocoapods-${{ hashFiles('sample/ios/Podfile.lock') }}
+        key: ${{ runner.os }}-cocoapods-ruby-${{ inputs.ruby-version }}-${{ hashFiles('sample/ios/Podfile.lock', 'sample/Gemfile.lock', 'package.json', 'sample/package.json', 'modules/@shopify/checkout-sheet-kit/package.json', 'yarn.lock') }}
         restore-keys: |
+          ${{ runner.os }}-cocoapods-ruby-${{ inputs.ruby-version }}-${{ hashFiles('sample/ios/Podfile.lock', 'sample/package.json', 'yarn.lock') }}
+          ${{ runner.os }}-cocoapods-ruby-${{ inputs.ruby-version }}-${{ hashFiles('sample/ios/Podfile.lock') }}
+          ${{ runner.os }}-cocoapods-ruby-${{ inputs.ruby-version }}-
           ${{ runner.os }}-cocoapods-
 
     - name: Install cocoapods
-      if: steps.cocoapods-cache.outputs.cache-hit != 'true'
+      if: steps.cache-cocoapods.outputs.cache-hit != 'true'
       shell: bash
       env:
         NO_FLIPPER: "1"
       run: |
+        set -euo pipefail
         ROOT=$(pwd)
         cd sample
         bundle install
         cd ios
-        NO_FLIPPER=1 bundle exec pod install
+        NO_FLIPPER=1 bundle exec pod install --no-repo-update
         cd $ROOT

.github/actions/setup-simulator/action.yml

@@ -12,5 +12,5 @@ runs:
         xcrun simctl list runtimes
         xcrun simctl list devicetypes
         xcrun simctl delete all
-        CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 15 Pro")
+        CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 16 Pro")
         echo "CURRENT_SIMULATOR_UUID=$CURRENT_SIMULATOR_UUID" >> $GITHUB_ENV

.github/workflows/ci.yml

@@ -6,10 +6,15 @@ on:
   pull_request:
     types: [opened, synchronize]
 
+env:
+  RUBY_VERSION: '3.1.2'
+  JAVA_VERSION: '22'
+
 jobs:
   lint-swift:
     name: Lint Swift code
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
@@ -21,6 +26,7 @@ jobs:
   license:
     name: Verify license headers
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
@@ -29,6 +35,7 @@ jobs:
   check-packed-files:
     name: Check package files
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     env:
       TERM: xterm
     steps:
@@ -45,6 +52,7 @@ jobs:
   lint:
     name: Lint module + sample
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
@@ -59,6 +67,7 @@ jobs:
   test:
     name: Run jest tests
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       pull-requests: write
@@ -84,6 +93,7 @@ jobs:
   test-android:
     name: Run Android Tests
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     needs: [lint, test]
     steps:
       - name: Checkout
@@ -93,28 +103,42 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Install JDK
-        # if: env.turbo_cache_hit != 1
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        id: setup-java
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: ${{ env.JAVA_VERSION }}
 
       - name: Run Android tests
+        timeout-minutes: 20
         env:
           GRADLE_OPTS: -Xmx4g -XX:MaxMetaspaceSize=768m
+          JAVA_HOME: ${{ steps.setup-java.outputs.path }}
         run: |
-          echo "STOREFRONT_DOMAIN=\"myshopify.com\"" > sample/.env
+          echo "JAVA_HOME: $JAVA_HOME"
+          java -version
+          javac -version
+          echo "STOREFRONT_DOMAIN=myshopify.com" > sample/.env
           yarn module build
           yarn sample test:android --no-daemon
 
   test-ios:
     name: Run iOS Tests
-    runs-on: macos-13-xlarge
+    runs-on: macos-15-xlarge
+    timeout-minutes: 20
     needs: [lint, lint-swift, test]
     steps:
       - name: Checkout
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
+      - name: Switch to Xcode 16.4
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_16.4.app
+
+      - name: Display Current Xcode Information
+        run: |
+          echo "Xcode Path: $(xcode-select -p)"
+          echo "Xcode Version: $(xcrun xcodebuild -version)"
       - name: Setup iOS Simulator
         uses: ./.github/actions/setup-simulator
 
@@ -132,8 +156,11 @@ jobs:
 
       - name: Install cocoapods
         uses: ./.github/actions/install-cocoapods
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
 
       - name: Run Swift tests
+        timeout-minutes: 15
         # If turbo has already cached the build it will return instantly here
         run: |
           yarn turbo run test:ios --cache-dir=".turbo" --no-daemon

package.json

@@ -28,10 +28,10 @@
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.27.6",
-    "@react-native/babel-preset": "0.74.83",
-    "@react-native/eslint-config": "0.74.83",
-    "@react-native/metro-config": "0.74.83",
-    "@react-native/typescript-config": "0.74.83",
+    "@react-native/babel-preset": "0.75.5",
+    "@react-native/eslint-config": "0.75.5",
+    "@react-native/metro-config": "0.75.5",
+    "@react-native/typescript-config": "0.75.5",
     "@tsconfig/react-native": "^3.0.6",
     "@types/jest": "^30.0.0",
     "@types/react": "^18",
@@ -42,10 +42,10 @@
     "eslint-plugin-prettier": "^5.5.1",
     "jest": "^30.0.3",
     "prettier": "^3.2.5",
-    "react": "^18.2.0",
-    "react-native": "0.74.1",
+    "react": "18.3.1",
+    "react-native": "0.75.5",
     "react-native-dotenv": "^3.4.9",
-    "react-native-gesture-handler": "^2.15.0",
+    "react-native-gesture-handler": "2.15.0",
     "react-native-gradle-plugin": "^0.71.19",
     "react-test-renderer": "18.3.1",
     "ts-jest": "^29.1.1",
@@ -78,6 +78,5 @@
       "@typescript-eslint/consistent-type-imports": "error",
       "no-console": "error"
     }
-  },
-  "packageManager": "[email protected]"
+  }
 }

sample/Gemfile

@@ -3,6 +3,9 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '1.16.2'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '<= 1.3.4'
 gem 'cocoapods-check', '1.1.0'
-gem 'activesupport', '>= 6.1.7.5', '< 7.3.0'

sample/Gemfile.lock

@@ -27,10 +27,10 @@ GEM
     benchmark (0.4.1)
     bigdecimal (3.2.2)
     claide (1.1.0)
-    cocoapods (1.16.2)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.2)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -44,10 +44,10 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.27.0, < 2.0)
+      xcodeproj (>= 1.23.0, < 2.0)
     cocoapods-check (1.1.0)
       cocoapods (~> 1.0)
-    cocoapods-core (1.16.2)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -67,7 +67,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.4)
     connection_pool (2.5.3)
     drb (2.2.3)
     escape (0.0.4)
@@ -81,12 +81,12 @@ GEM
       mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.13.2)
     logger (1.7.0)
     minitest (5.25.5)
     molinillo (0.8.0)
     mutex_m (0.3.0)
-    nanaimo (0.4.0)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     nkf (0.2.0)
@@ -98,24 +98,26 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
+      nanaimo (~> 0.3.0)
       rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, < 7.3.0)
-  cocoapods (= 1.16.2)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
   cocoapods-check (= 1.1.0)
+  concurrent-ruby (<= 1.3.4)
+  xcodeproj (< 1.26.0)
 
 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.23

sample/android/app/build.gradle

@@ -47,10 +47,13 @@ react {
 
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
-     hermesCommand = "../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = "../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-     hermesFlags = ["-O", "-output-source-map"]
+    hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -143,12 +146,17 @@ project.ext.vectoricons = [
 
 apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
 
-apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
+def stripSurroundingQuotes(String value) {
+  if (value == null) {
+    return null
+  }
+  return value.trim()?.replaceAll(/^['"]|['"]$/, '')
+}
+
 def properties = loadProperties()
-def storefrontDomain = properties.getProperty("STOREFRONT_DOMAIN")
+def storefrontDomain = stripSurroundingQuotes(properties.getProperty("STOREFRONT_DOMAIN"))
 
 if (!storefrontDomain) {
   println("**** Please add a .env file with STOREFRONT_DOMAIN set *****")

sample/android/app/src/main/AndroidManifest.template.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -33,7 +33,7 @@
             <category android:name="android.intent.category.BROWSABLE" />
 
             <!-- Note: the host here will be replaced on application start -->
-            <data android:scheme="https" android:host={{STOREFRONT_DOMAIN}} />
+            <data android:scheme="https" android:host="{{STOREFRONT_DOMAIN}}" />
         </intent-filter>
       </activity>
     </application>

sample/android/build.gradle

@@ -1,20 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
+        buildToolsVersion = "35.0.0"
         minSdkVersion = 23
-        compileSdkVersion = 34
+        compileSdkVersion = 35
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.22"
-
+        kotlinVersion = "1.9.25"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-      classpath("com.android.tools.build:gradle")
+      classpath("com.android.tools.build:gradle:8.6.0")
       classpath("com.facebook.react:react-native-gradle-plugin")
       classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }

sample/android/gradle.properties

@@ -23,8 +23,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using