Merge pull request #2317 from CruGlobal/develop

Merge develop into master

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

@@ -6,7 +6,7 @@ runs:
     - name: Select Xcode Version
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '15.4.0'
+        xcode-version: '16.0.0'
     # Required for KotlinMultiplatform
     - name: Setup Java
       uses: actions/setup-java@v4

.github/workflows/download_onesky_translations.yml

@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   download_and_commit_onesky_translations:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
 

.github/workflows/renovate_repair.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   cocoapods:
-    runs-on: macos-14
+    runs-on: macos-15
     if: ${{ github.actor == 'renovate[bot]' }}
     steps:
       - name: Checkout code

.github/workflows/run-tests.yml

@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   run_tests:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
 

.github/workflows/swift-lint.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   swift_lint:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
 

.github/workflows/testflight.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   distribute_to_testflight:
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
     steps:
@@ -35,7 +35,7 @@ jobs:
         env:
           MATCH_GIT_BASIC_AUTHORIZATION_PAT: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION_PAT }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        run: bundle exec fastlane cru_shared_lane_build_and_deploy_for_testflight_release is_running_in_ci:true
+        run: bundle exec fastlane cru_shared_lane_build_and_deploy_for_testflight_release is_running_in_ci:true gym_destination:generic/platform=iOS
 
       - name: Archive Fastlane Gym Logs
         if: always()

.github/workflows/update-swift-package-dependencies.yml

@@ -0,0 +1,38 @@
+name: Update Xcode Project Swift Package Dependencies
+
+on: 
+  schedule:
+    - cron: '0 0 * * 5'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  update_xcode_project_swift_package_dependencies:
+    runs-on: macos-15
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Resolve Dependencies
+        id: resolution
+        uses: GetSidetrack/action-xcodeproj-spm-update@main
+        with:
+          workspace: 'godtools.xcworkspace'
+          scheme: 'GodTools-Production'
+          forceResolution: true
+          failWhenOutdated: false
+
+      - name: Create Pull Request
+        if: steps.resolution.outputs.dependenciesChanged == 'true'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          branch: 'dependencies/xcode-swift-package-dependencies'
+          delete-branch: true
+          commit-message: 'Update Xcode Project Swift Package Dependencies'
+          title: 'Updated Xcode Project Swift Package Dependencies'

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.14'
+gem 'cocoapods', '~> 1.16'
 gem 'fastlane'
 gem 'xcode-install', '~> 2.8'
 

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.1)
+    activesupport (7.2.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -24,17 +24,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.981.0)
-    aws-sdk-core (3.209.1)
+    aws-partitions (1.992.0)
+    aws-sdk-core (3.210.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.94.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.166.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.10.0)
@@ -43,10 +43,10 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.16.1)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.16.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -60,8 +60,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+      xcodeproj (>= 1.26.0, < 2.0)
+    cocoapods-core (1.16.1)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -96,7 +96,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.111.0)
+    excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -126,7 +126,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.223.1)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -142,6 +142,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -169,6 +170,8 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-onesky (0.2.1)
       onesky-ruby
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
@@ -219,20 +222,21 @@ GEM
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.9.1)
+    json (2.7.5)
+    jwt (2.9.3)
       base64
     logger (1.6.1)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0903)
+    mime-types-data (3.2024.1001)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
@@ -254,7 +258,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -269,6 +273,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -287,13 +292,13 @@ GEM
     xcode-install (2.8.1)
       claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.26.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
@@ -306,7 +311,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  cocoapods (~> 1.14)
+  cocoapods (~> 1.16)
   fastlane
   fastlane-plugin-onesky
   xcode-install (~> 2.8)

Podfile

@@ -5,15 +5,13 @@ source 'https://github.com/CruGlobal/cocoapods-specs.git'
 # Uncomment this line to define a global platform for your project
 platform :ios, '14.0'
 
-use_frameworks!
-
 # Specs finder:
 # https://github.com/CocoaPods/Specs/find/master
 
 def shared_pods
 
   # CruGlobal pods
-  pod 'GodToolsShared', '1.0.1'
+  pod 'GodToolsShared', '1.1.0-SNAPSHOT'
 end
 
 target 'godtools' do

Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - GodToolsShared (1.0.1)
+  - GodToolsShared (1.1.0-SNAPSHOT)
 
 DEPENDENCIES:
-  - GodToolsShared (= 1.0.1)
+  - GodToolsShared (= 1.1.0-SNAPSHOT)
 
 SPEC REPOS:
   https://github.com/CruGlobal/cocoapods-specs.git:
     - GodToolsShared
 
 SPEC CHECKSUMS:
-  GodToolsShared: 88f4b3a0ad35c81fd9ed818286a1ce402d1b0468
+  GodToolsShared: 404a619e53dc1890091397ac4e1da69afb5eabcd
 
-PODFILE CHECKSUM: ec953de20c20647dabc4d87ffeef0341767af679
+PODFILE CHECKSUM: 1816453b60fe876696e3cc9b1da49602bb07e16b
 
 COCOAPODS: 1.15.2