Merge pull request #1175 from StepicOrg/release/1.219.1

Release 1.219.1
StepicOrg · Oct 29, 2024 · a0e3696 · a0e3696
2 parents 7dede3e + 831d824
commit a0e3696
Show file tree

Hide file tree

Showing 29 changed files with 358 additions and 271 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -28,4 +28,4 @@ updates:
       - "dependencies"
       - "ci/cd"
     rebase-strategy: "disabled"
-    target-branch: "dev"
+    target-branch: "dev"
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,13 +1,30 @@
 a/b:
-  - Stepic/Legacy/Analytics/SplitTests/*
-  - Stepic/Legacy/Analytics/SplitTests/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          [
+            "Stepic/Legacy/Analytics/SplitTests/*",
+            "Stepic/Legacy/Analytics/SplitTests/**/*",
+          ]
 
 dependencies:
-  - Gemfile
-  - Gemfile.lock
-  - Podfile
-  - Podfile.lock
+  - changed-files:
+      - any-glob-to-any-file:
+          ["Gemfile", "Gemfile.lock", "Podfile", "Podfile.lock"]
+
+ci/cd:
+  - changed-files:
+      - any-glob-to-any-file:
+          [
+            ".github/workflows/**",
+            ".github/actions/**",
+            ".github/dependabot.yml",
+            ".github/filters.yaml",
+            ".github/labeler.yml",
+          ]
 
 main:
-  - Stepic/*
-  - Stepic/**/*
+  - changed-files:
+      - any-glob-to-any-file: ["Stepic/*", "Stepic/**/*"]
+
+release:
+  - base-branch: "master"
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -7,6 +7,6 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/labeler@v4.3.0
+      - uses: actions/labeler@v5
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 ruby "3.2.1"
 
-gem "fastlane", "2.214.0"
-gem "cocoapods", "1.12.1"
-gem "generamba", "1.5.0"
+gem "fastlane", "2.220.0"
+gem "cocoapods", "1.16.0"
+gem "generamba", git: "https://github.com/ivan-magda/Generamba.git", branch: "develop"
 
-eval_gemfile("fastlane/Pluginfile")
+eval_gemfile("fastlane/Pluginfile")
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/ivan-magda/Generamba.git
+  revision: a58a005e128e8270ec25f782fcb1c6c2449e0556
+  branch: develop
+  specs:
+    generamba (1.6.0)
+      cocoapods-core (>= 1.4.0, < 2.0.0)
+      git (= 1.13.0)
+      liquid (= 4.0.4)
+      terminal-table (~> 3)
+      thor (= 0.19.1)
+      xcodeproj (>= 1.6.0, < 2.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -43,12 +56,12 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     claide (1.1.0)
-    cocoapods (1.12.1)
+    cocoapods (1.16.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.12.1)
+      cocoapods-core (= 1.16.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -60,8 +73,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.12.1)
+      xcodeproj (>= 1.26.0, < 2.0)
+    cocoapods-core (1.16.0)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -72,7 +85,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -126,14 +139,14 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.214.0)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -145,79 +158,75 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-firebase_app_distribution (0.9.1)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
-    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    generamba (1.5.0)
-      cocoapods-core (>= 1.4.0, < 2.0.0)
-      git (= 1.2.9.1)
-      liquid (= 4.0.0)
-      terminal-table (= 1.4.5)
-      thor (= 0.19.1)
-      xcodeproj (>= 1.5.0, < 2.0.0)
     gh_inspector (1.1.3)
-    git (1.2.9.1)
-    google-apis-androidpublisher_v3 (0.74.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.15.1)
+    git (1.13.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
       mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
+      rexml
     google-apis-firebaseappdistribution_v1 (0.3.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-firebaseappdistribution_v1alpha (0.2.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-iamcredentials_v1 (0.21.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.16.0)
-      google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.47.0)
-      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.2.1)
-      faraday (>= 1.0, < 3.a)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.4.0)
-    google-cloud-storage (1.52.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-core (~> 0.13)
-      google-apis-iamcredentials_v1 (~> 0.18)
-      google-apis-storage_v1 (~> 0.38)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.11.2)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -232,25 +241,25 @@ GEM
     json (2.7.4)
     jwt (2.9.3)
       base64
-    liquid (4.0.0)
+    liquid (4.0.4)
     logger (1.6.1)
     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)
-    mutex_m (0.2.0)
     nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
-    optparse (0.1.1)
+    optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (4.0.7)
     rake (13.2.1)
+    rchardet (1.8.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -262,7 +271,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     securerandom (0.3.1)
-    security (0.1.3)
+    security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
@@ -272,7 +281,8 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.4.5)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thor (0.19.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
@@ -284,6 +294,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcodeproj (1.26.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -298,13 +309,13 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
-  cocoapods (= 1.12.1)
-  fastlane (= 2.214.0)
+  cocoapods (= 1.16.0)
+  fastlane (= 2.220.0)
   fastlane-plugin-firebase_app_distribution
-  generamba (= 1.5.0)
+  generamba!
 
 RUBY VERSION
    ruby 3.2.1p31

diff --git a/Podfile b/Podfile
@@ -45,11 +45,11 @@ def all_pods
   pod "SnapKit", "5.0.1"
 
   # Firebase
-  pod "Firebase/Core", "8.9.1"
-  pod "Firebase/Messaging", "8.9.1"
-  pod "Firebase/Analytics", "8.9.1"
-  pod "Firebase/Crashlytics", "8.9.1"
-  pod "Firebase/RemoteConfig", "8.9.1"
+  pod "Firebase/Core", "10.15.0"
+  pod "Firebase/Messaging", "10.15.0"
+  pod "Firebase/Analytics", "10.15.0"
+  pod "Firebase/Crashlytics", "10.15.0"
+  pod "Firebase/RemoteConfig", "10.15.0"
 
   pod "YandexMobileMetrica/Dynamic", "3.17.0"
   pod "Amplitude", "8.5.0"
@@ -102,6 +102,22 @@ target "Stepic" do
 end
 
 post_install do |installer|
+  # Fix Xcode 15 Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
+  installer.aggregate_targets.each do |target|
+    target.xcconfigs.each do |variant, xcconfig|
+      xcconfig_path = target.client_root + target.xcconfig_relative_path(variant)
+      IO.write(xcconfig_path, IO.read(xcconfig_path).gsub("DT_TOOLCHAIN_DIR", "TOOLCHAIN_DIR"))
+    end
+  end
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      if config.base_configuration_reference.is_a? Xcodeproj::Project::Object::PBXFileReference
+        xcconfig_path = config.base_configuration_reference.real_path
+        IO.write(xcconfig_path, IO.read(xcconfig_path).gsub("DT_TOOLCHAIN_DIR", "TOOLCHAIN_DIR"))
+      end
+    end
+  end
+
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       if config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"].to_f < 12.0