From be54b918506f2b1b86619eda59b5f2c1e1987a66 Mon Sep 17 00:00:00 2001
From: Volodymyr Chekyrta <volodymyr.chekyrta@raccoongang.com>
Date: Wed, 30 Oct 2024 17:16:03 +0200
Subject: [PATCH] build: upgrade fastlane version

---
 .github/workflows/swiftlint.yml  | 37 ++++++++++++++++++++++++++++++++
 .github/workflows/unit_tests.yml |  7 ------
 Gemfile.lock                     | 32 +++++++++++++++------------
 fastlane/Fastfile                |  4 ++--
 4 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/swiftlint.yml

diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml
new file mode 100644
index 000000000..d2d579ce3
--- /dev/null
+++ b/.github/workflows/swiftlint.yml
@@ -0,0 +1,37 @@
+name: SwiftLint
+
+on:
+  workflow_dispatch:
+
+  pull_request:
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: macos-latest
+
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('swiftlint-develop-{0}', github.sha) || format('swiftlint-{0}', github.ref) }}
+      cancel-in-progress: true
+
+    steps:
+      - uses: nschloe/action-cached-lfs-checkout@v1.2.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: actions/cache@v3
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      - name: Setup environment
+        run:
+          source ci_scripts/ci_prepare_env.sh && setup_github_actions_environment
+
+      - name: SwiftLint
+        run:
+          bundle exec fastlane linting
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index ee3806b98..99a84f445 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -3,9 +3,6 @@ name: Unit Tests
 on:
   workflow_dispatch:
 
-  push:
-    branches: [ develop ]
-
   pull_request:
 
 jobs:
@@ -35,10 +32,6 @@ jobs:
         run:
           source ci_scripts/ci_prepare_env.sh && setup_github_actions_environment
 
-      - name: SwiftLint
-        run:
-          bundle exec fastlane linting
-
       - name: Run tests
         run: bundle exec fastlane unit_tests
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f6449ff37..d9bc70b14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,20 +10,20 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.987.0)
-    aws-sdk-core (3.209.1)
+    aws-partitions (1.998.0)
+    aws-sdk-core (3.211.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.167.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)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -68,7 +68,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.224.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +84,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)
@@ -109,6 +110,8 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -151,14 +154,14 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.5)
     jwt (2.9.3)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
     optparse (0.5.0)
@@ -171,7 +174,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -184,6 +187,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)
@@ -198,12 +202,12 @@ GEM
     xcode-install (2.8.1)
       claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.25.1)
+    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)
+      nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 137d92894..5393609bf 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -15,7 +15,7 @@ update_fastlane
 
 before_all do
   xcodes(
-    version: '16.0',
+    version: '16.1',
     select_for_current_build_only: true,
   )
 
@@ -37,7 +37,7 @@ end
 lane :unit_tests do
   run_tests(
     workspace: "OpenEdX.xcworkspace",
-    device: "iPhone 15",
+    device: "iPhone 16",
     scheme: "OpenEdXDev"
   )
 end