diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a1e75e52ad..4d6098491f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,4 +28,4 @@ updates: - "dependencies" - "ci/cd" rebase-strategy: "disabled" - target-branch: "dev" \ No newline at end of file + target-branch: "dev" diff --git a/.github/labeler.yml b/.github/labeler.yml index f0d438be34..0d2ff490a2 100644 --- 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/**/* \ No newline at end of file + - 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 index fe461c309f..a973e93f54 100644 --- 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 }}" \ No newline at end of file + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/Gemfile b/Gemfile index 94b80f72ff..911f61d3c2 100644 --- 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") \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 2e12b15421..582254dc0d 100644 --- 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,44 +158,41 @@ 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) @@ -190,34 +200,33 @@ GEM 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,7 +241,7 @@ 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) @@ -240,17 +249,17 @@ GEM 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 index 6d69230e22..75e6a5dc94 100644 --- 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 diff --git a/Podfile.lock b/Podfile.lock index fa7d53e176..a3a77c45b9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -4,11 +4,12 @@ PODS: - SwiftyGif - Alamofire (5.4.4) - Amplitude (8.5.0) - - AppAuth (1.4.0): - - AppAuth/Core (= 1.4.0) - - AppAuth/ExternalUserAgent (= 1.4.0) - - AppAuth/Core (1.4.0) - - AppAuth/ExternalUserAgent (1.4.0) + - AppAuth (1.7.5): + - AppAuth/Core (= 1.7.5) + - AppAuth/ExternalUserAgent (= 1.7.5) + - AppAuth/Core (1.7.5) + - AppAuth/ExternalUserAgent (1.7.5): + - AppAuth/Core - Atributika (4.10.1) - BEMCheckBox (1.4.1) - Branch (1.40.2) @@ -16,136 +17,154 @@ PODS: - Charts/Core (= 4.1.0) - Charts/Core (4.1.0): - SwiftAlgorithms (~> 1.0) - - CocoaLumberjack (3.7.2): - - CocoaLumberjack/Core (= 3.7.2) - - CocoaLumberjack/Core (3.7.2) + - CocoaLumberjack (3.8.5): + - CocoaLumberjack/Core (= 3.8.5) + - CocoaLumberjack/Core (3.8.5) - DeviceKit (4.5.2) - DownloadButton (0.1.0) - EasyTipView (2.1.0) - - Firebase/Analytics (8.9.1): + - Firebase/Analytics (10.15.0): - Firebase/Core - - Firebase/Core (8.9.1): + - Firebase/Core (10.15.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.9.1) - - Firebase/CoreOnly (8.9.1): - - FirebaseCore (= 8.9.1) - - Firebase/Crashlytics (8.9.1): + - FirebaseAnalytics (~> 10.15.0) + - Firebase/CoreOnly (10.15.0): + - FirebaseCore (= 10.15.0) + - Firebase/Crashlytics (10.15.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 8.9.0) - - Firebase/Messaging (8.9.1): + - FirebaseCrashlytics (~> 10.15.0) + - Firebase/Messaging (10.15.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 8.9.0) - - Firebase/RemoteConfig (8.9.1): + - FirebaseMessaging (~> 10.15.0) + - Firebase/RemoteConfig (10.15.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 8.9.0) - - FirebaseABTesting (8.9.0): - - FirebaseCore (~> 8.0) - - FirebaseAnalytics (8.9.1): - - FirebaseAnalytics/AdIdSupport (= 8.9.1) - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.9.1): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - FirebaseCore (8.9.1): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Logger (~> 7.6) - - FirebaseCoreDiagnostics (8.9.0): - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Logger (~> 7.6) - - nanopb (~> 2.30908.0) - - FirebaseCrashlytics (8.9.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/Environment (~> 7.6) - - nanopb (~> 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseInstallations (8.9.0): - - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/UserDefaults (~> 7.6) - - PromisesObjC (< 3.0, >= 1.2) - - FirebaseMessaging (8.9.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleDataTransport (~> 9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Reachability (~> 7.6) - - GoogleUtilities/UserDefaults (~> 7.6) - - nanopb (~> 2.30908.0) - - FirebaseRemoteConfig (8.9.0): - - FirebaseABTesting (~> 8.0) - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" + - FirebaseRemoteConfig (~> 10.15.0) + - FirebaseABTesting (10.29.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.15.0): + - FirebaseAnalytics/AdIdSupport (= 10.15.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (10.15.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.15.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseCore (10.15.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.29.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.29.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.15.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesObjC (~> 2.1) + - FirebaseInstallations (10.29.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - PromisesObjC (~> 2.1) + - FirebaseMessaging (10.15.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Reachability (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseRemoteConfig (10.15.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseSessions (10.29.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.13) + - GoogleUtilities/UserDefaults (~> 7.13) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) - FLEX (4.4.1) - - GoogleAppMeasurement (8.9.1): - - GoogleAppMeasurement/AdIdSupport (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.9.1): - - GoogleAppMeasurement/WithoutAdIdSupport (= 8.9.1) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (8.9.1): - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) + - GoogleAppMeasurement (10.15.0): + - GoogleAppMeasurement/AdIdSupport (= 10.15.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (10.15.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.15.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (10.15.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleDataTransport (9.4.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - GoogleSignIn (6.1.0): - AppAuth (~> 1.4) - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.6.0): + - GoogleUtilities/AppDelegateSwizzler (7.13.3): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.6.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.6.0): + - GoogleUtilities/Logger (7.13.3): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.6.0): + - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (7.13.3): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.6.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.3): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.6.0)" - - GoogleUtilities/Reachability (7.6.0): + - "GoogleUtilities/NSData+zlib (7.13.3)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/Reachability (7.13.3): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.6.0): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (7.13.3): - GoogleUtilities/Logger - - GTMAppAuth (1.2.2): - - AppAuth/Core (~> 1.4) - - GTMSessionFetcher/Core (~> 1.5) - - GTMSessionFetcher/Core (1.7.0) + - GoogleUtilities/Privacy + - GTMAppAuth (1.3.1): + - AppAuth/Core (~> 1.6) + - GTMSessionFetcher/Core (< 3.0, >= 1.5) + - GTMSessionFetcher/Core (1.7.2) - Highlightr (2.1.0) - IQKeyboardManagerSwift (6.5.6) - Kanna (5.2.7) @@ -159,11 +178,11 @@ PODS: - URITemplate (~> 3.0) - Mockingjay/XCTest (3.0.0-alpha.1): - Mockingjay/Core - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) + - nanopb (2.30909.1): + - nanopb/decode (= 2.30909.1) + - nanopb/encode (= 2.30909.1) + - nanopb/decode (2.30909.1) + - nanopb/encode (2.30909.1) - Nimble (9.2.1) - Nuke (9.5.0) - Pageboy (3.6.2) @@ -179,7 +198,9 @@ PODS: - PromiseKit/CorePromise - PromiseKit/UIKit (6.16.1): - PromiseKit/CorePromise - - PromisesObjC (2.0.0) + - PromisesObjC (2.4.0) + - PromisesSwift (2.4.0): + - PromisesObjC (= 2.4.0) - Quick (4.0.0) - SDWebImage (5.12.1): - SDWebImage/Core (= 5.12.1) @@ -193,7 +214,7 @@ PODS: - SwiftAlgorithms (1.0.0) - SwiftDate (6.3.1) - SwiftLint (0.45.1) - - SwiftyGif (5.4.0) + - SwiftyGif (5.4.5) - SwiftyJSON (5.0.0) - Tabman (2.10.0): - Pageboy (~> 3.6.0) @@ -220,11 +241,11 @@ DEPENDENCIES: - DeviceKit (= 4.5.2) - DownloadButton (= 0.1.0) - EasyTipView (= 2.1.0) - - Firebase/Analytics (= 8.9.1) - - Firebase/Core (= 8.9.1) - - Firebase/Crashlytics (= 8.9.1) - - Firebase/Messaging (= 8.9.1) - - Firebase/RemoteConfig (= 8.9.1) + - Firebase/Analytics (= 10.15.0) + - Firebase/Core (= 10.15.0) + - Firebase/Crashlytics (= 10.15.0) + - Firebase/Messaging (= 10.15.0) + - Firebase/RemoteConfig (= 10.15.0) - FLEX (from `https://github.com/ivan-magda/FLEX.git`, branch `master`) - GoogleSignIn (= 6.1.0) - Highlightr (from `https://github.com/ivan-magda/Highlightr.git`, tag `v2.1.3`) @@ -273,11 +294,13 @@ SPEC REPOS: - FirebaseABTesting - FirebaseAnalytics - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension + - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations - FirebaseMessaging - FirebaseRemoteConfig + - FirebaseSessions - GoogleAppMeasurement - GoogleDataTransport - GoogleSignIn @@ -294,6 +317,7 @@ SPEC REPOS: - Pageboy - pop - PromisesObjC + - PromisesSwift - Quick - SDWebImage - SnapKit @@ -364,46 +388,49 @@ SPEC CHECKSUMS: Agrume: 21b96a1138abc0f890211bfcb12f8b1e3464b4c1 Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9 Amplitude: ef9ed339ddd33c9183edf63fa4bbaa86cf873321 - AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 + AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa Atributika: 47e778507cfb3cd2c996278b0285221a62e97d71 BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e Branch: d99436c6f3d5b2529ba948d273e47e732830f207 - Charts: 354f86803d11d9c35de280587fef50d1af063978 - CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da + Charts: ce0768268078eee0336f122c3c4ca248e4e204c5 + CocoaLumberjack: 6a459bc897d6d80bd1b8c78482ec7ad05dffc3f0 DeviceKit: c622fc19f795f3e0b4d75d6d11b26604338cdab3 DownloadButton: 49a21a89e0d7d1b42d9134f79aaa40e727cd57c3 EasyTipView: a92b6edc377b81c5ac18e9fd35d5ee78e9409488 - Firebase: fb5114cd2bf96e2ff7bcb01d0d9a156cf5fd2f07 - FirebaseABTesting: 9de50b34bf9eb4a07d4edb7af82c14152fd905aa - FirebaseAnalytics: 4ab446ce08a3fe52e8a4303dd997cf26276bf968 - FirebaseCore: c5aab092d9c4b8efea894946166b04c9d9ef0e68 - FirebaseCoreDiagnostics: 5daa63f1c1409d981a2d5007daa100b36eac6a34 - FirebaseCrashlytics: 40efbd81157dae307ec95612fa1328347284d2c2 - FirebaseInstallations: caa7c8e0d3e2345b8829d2fa9ca1b4dfbf2fcc85 - FirebaseMessaging: 82c4a48638f53f7b184f3cc9f6cd2cbe533ab316 - FirebaseRemoteConfig: a75c1bd44ebd3ed4ad3fa1ff09414a8b133be405 + Firebase: 66043bd4579e5b73811f96829c694c7af8d67435 + FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe + FirebaseAnalytics: 47cef43728f81a839cf1306576bdd77ffa2eac7e + FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e + FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f + FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 + FirebaseCrashlytics: a83f26fb922a3fe181eb738fb4dcf0c92bba6455 + FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd + FirebaseMessaging: 0c0ae1eb722ef0c07f7801e5ded8dccd1357d6d4 + FirebaseRemoteConfig: 64b6ada098c649304114a817effd7e5f87229b11 + FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc FLEX: 75ca95cff4bd57592c6e75adee7651ace29f9c25 - GoogleAppMeasurement: 837649ad3987936c232f6717c5680216f6243d24 - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleAppMeasurement: 722db6550d1e6d552b08398b69a975ac61039338 + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleSignIn: c90b5bec45e780f54c6a8e1e3c182a86e3dda69d - GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237 - GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 - GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd + GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba Highlightr: 9fbc57afd1921d274d5df911caabf91eaf25f0f3 IQKeyboardManagerSwift: c7df9d2deb356c04522f5c4b7b6e4ce4d8ed94fe Kanna: 01cfbddc127f5ff0963692f285fcbc8a9d62d234 Koloda: d07b9199a383abc5898b62aa945a599f5e7c0c4b lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e Mockingjay: 97656c6f59879923976a0a52ef09da45756cca82 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5 Nuke: 6f400a4ea957e09149ec335a3c6acdcc814d89e4 Pageboy: cf121b9dd48c63f3f281b2a9ec93d02e0f23879b PanModal: 3e16ead1a907fb06f4df3f13492fd00149fa4974 pop: d582054913807fd11fd50bfe6a539d91c7e1a55a Presentr: 931d50e158060ea88fbf8f3dd202b17e0bb53eb0 - PromiseKit: ad27b174e5d8587cf799888f5e738f88e17055d8 - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 + PromiseKit: d4b7fa52340b2bf1423ddb39b5edbc4642d1b13a + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4 SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb @@ -414,7 +441,7 @@ SPEC CHECKSUMS: SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53 SwiftDate: 72d28954e8e1c6c1c0f917ccc8005e4f83c7d4b2 SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761 - SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7 + SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7 Tabman: d8d6ab0b483c7db375a71ac227d3ef791b56a049 TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 @@ -423,6 +450,6 @@ SPEC CHECKSUMS: VK-ios-sdk: 5bcf00a2014a7323f98db9328b603d4f96635caa YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4 -PODFILE CHECKSUM: 75718f193cfc7924dbc1854e38c62a6d03cc46c6 +PODFILE CHECKSUM: 32ae5ca74085f0729c6725e8dc77732580571c83 -COCOAPODS: 1.12.1 +COCOAPODS: 1.16.0 diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj index e400ae7119..687af4acfa 100644 --- a/Stepic.xcodeproj/project.pbxproj +++ b/Stepic.xcodeproj/project.pbxproj @@ -10996,11 +10996,13 @@ "${BUILT_PRODUCTS_DIR}/FLEX/FLEX.framework", "${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", @@ -11016,6 +11018,7 @@ "${BUILT_PRODUCTS_DIR}/Presentr/Presentr.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/STRegex/Regex.framework", "${BUILT_PRODUCTS_DIR}/SVGKit/SVGKit.framework", @@ -11058,11 +11061,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLEX.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", @@ -11078,6 +11083,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Presentr.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Regex.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVGKit.framework", @@ -11130,11 +11136,13 @@ "${BUILT_PRODUCTS_DIR}/FLEX/FLEX.framework", "${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", @@ -11150,6 +11158,7 @@ "${BUILT_PRODUCTS_DIR}/Presentr/Presentr.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/STRegex/Regex.framework", "${BUILT_PRODUCTS_DIR}/SVGKit/SVGKit.framework", @@ -11188,11 +11197,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLEX.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", @@ -11208,6 +11219,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Presentr.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Regex.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVGKit.framework", @@ -13298,7 +13310,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist"; @@ -13323,7 +13335,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -13465,7 +13477,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Stepic/Info-Production.plist"; @@ -13495,7 +13507,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -13586,7 +13598,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Stepic/Info-Develop.plist"; @@ -13638,7 +13650,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist"; @@ -13719,7 +13731,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Stepic/Info-Develop.plist"; @@ -13767,7 +13779,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -14287,7 +14299,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Stepic/Info-Release.plist"; @@ -14341,7 +14353,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist"; @@ -14423,7 +14435,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Stepic/Info-Release.plist"; @@ -14471,7 +14483,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 435; + CURRENT_PROJECT_VERSION = 437; DEVELOPMENT_TEAM = UJ4KC2QN7B; INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/Stepic/Info-Develop.plist b/Stepic/Info-Develop.plist index a7916a75dc..948baf9d78 100644 --- a/Stepic/Info-Develop.plist +++ b/Stepic/Info-Develop.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.219-develop + 1.219.2-develop CFBundleSignature ???? CFBundleURLTypes @@ -62,7 +62,7 @@ CFBundleVersion - 435 + 437 FacebookAppID 171127739724012 FacebookDisplayName diff --git a/Stepic/Info-Production.plist b/Stepic/Info-Production.plist index f70fb21b06..0718512bdc 100644 --- a/Stepic/Info-Production.plist +++ b/Stepic/Info-Production.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.219 + 1.219.2 CFBundleSignature ???? CFBundleURLTypes @@ -62,7 +62,7 @@ CFBundleVersion - 435 + 437 FacebookAppID 171127739724012 FacebookDisplayName diff --git a/Stepic/Info-Release.plist b/Stepic/Info-Release.plist index 749f9ab56f..e8373e7fc3 100644 --- a/Stepic/Info-Release.plist +++ b/Stepic/Info-Release.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.219-release + 1.219.2-release CFBundleSignature ???? CFBundleURLTypes @@ -62,7 +62,7 @@ CFBundleVersion - 435 + 437 FacebookAppID 171127739724012 FacebookDisplayName diff --git a/Stepic/Legacy/Views/AvatarImageView.swift b/Stepic/Legacy/Views/AvatarImageView.swift index 28914cc39f..bf58c7214e 100644 --- a/Stepic/Legacy/Views/AvatarImageView.swift +++ b/Stepic/Legacy/Views/AvatarImageView.swift @@ -93,6 +93,10 @@ final class AvatarImageView: UIImageView { label.textAlignment = NSTextAlignment.center label.backgroundColor = UIColor(hex6: self.colors[letters.hash % self.colors.count]) + if label.bounds.size == .zero { + return nil + } + let scale = UIScreen.main.scale UIGraphicsBeginImageContextWithOptions(label.bounds.size, false, scale) if let context = UIGraphicsGetCurrentContext() { diff --git a/Stepic/en.lproj/Localizable.strings b/Stepic/en.lproj/Localizable.strings index 8f0a2a1357..a881d5e153 100644 --- a/Stepic/en.lproj/Localizable.strings +++ b/Stepic/en.lproj/Localizable.strings @@ -565,7 +565,7 @@ CourseInfoPurchaseModalWishlistButtonInWishlistTitle = "Added to Wishlist"; CourseInfoPurchaseModalBuyButtonPurchaseInProgressTitle = "Processing the Payment"; CourseInfoPurchaseModalPurchaseErrorStatusTitle = "The payment was successful, but the purchase is not completed"; -CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "An error occurred while processing the payment, try to restore the purchase and contact support, if the error persists. The funds will not be debited again."; +CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "An error occurred while processing the payment, try to restore the purchase and contact support, if the error persists. The funds will not be debited again."; CourseInfoPurchaseModalPurchaseErrorRestoreTitle = "Restore Purchase"; CourseInfoPurchaseModalPurchaseErrorContactSupportSubject = "Error when purchasing course"; CourseInfoPurchaseModalPurchaseSuccessStatusTitle = "The payment was successful"; @@ -826,7 +826,7 @@ PrivacyPolicyTitle = "Privacy Policy"; TermsOfServiceLink = "https://welcome.stepik.org/en/terms"; PrivacyPolicyLink = "https://welcome.stepik.org/en/privacy"; HelpCenterTitle = "Help Center"; -HelpCenterLink = "https://support.stepik.org/hc/en-us"; +HelpCenterLink = "https://help.stepik.org/"; ContactSupportTitle = "Contact Support"; ContactSupportSubject = "Stepik iOS feedback"; ContactSupportMessageBody = "I do the following:\n\n1.\n2.\n3.\n\nWhat happens:\n\nI expect:\n\n=======\nPlease do not delete this information\n=======\nApp Version: %@\nStepik ID: %@"; @@ -1036,10 +1036,10 @@ StepARQuickLookUnsupportedAlertMessage = "Your device is not supported by viewin StepDisabledStudentTitle = "You can't view the assignment yet"; StepDisabledStudentMessage = "Write to the course authors so that they pay attention to the settings %@.

Access may be restored after some time."; StepDisabledTeacherTitle = "Learners can't view the assignment yet"; -StepDisabledTeacherInCourseMessage = "For enable learners to view the assignment, change the course type to %@.

This step has paid features. Learn about plans."; +StepDisabledTeacherInCourseMessage = "For enable learners to view the assignment, change the course type to %@.

This step has paid features. Learn about plans."; StepDisabledTeacherInCoursePlanProTitle = "PRO or paid"; StepDisabledTeacherInCoursePlanEnterpriseTitle = "Enterprise"; -StepDisabledTeacherNoCourseMessage = "For enable learners to view the assignment, add the lesson to %@.

This step has paid features. Learn about plans."; +StepDisabledTeacherNoCourseMessage = "For enable learners to view the assignment, add the lesson to %@.

This step has paid features. Learn about plans."; StepDisabledTeacherNoCoursePlanProTitle = "a PRO or paid course"; StepDisabledTeacherNoCoursePlanEnterpriseTitle = "an Enterprise course"; StepPosition = "Step %@"; diff --git a/Stepic/ru.lproj/Localizable.strings b/Stepic/ru.lproj/Localizable.strings index f349c1c33b..ec594921c8 100644 --- a/Stepic/ru.lproj/Localizable.strings +++ b/Stepic/ru.lproj/Localizable.strings @@ -567,7 +567,7 @@ CourseInfoPurchaseModalWishlistButtonInWishlistTitle = "Добавлен в Сп CourseInfoPurchaseModalBuyButtonPurchaseInProgressTitle = "Обработка платежа"; CourseInfoPurchaseModalPurchaseErrorStatusTitle = "Оплата прошла, покупка не завершена"; -CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "При обработке платежа произошла ошибка, попробуйте восстановить покупку и свяжитесь с поддержкой, если ошибка не будет устранена. Повторного списания средств не произойдет."; +CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "При обработке платежа произошла ошибка, попробуйте восстановить покупку и свяжитесь с поддержкой, если ошибка не будет устранена. Повторного списания средств не произойдет."; CourseInfoPurchaseModalPurchaseErrorRestoreTitle = "Восстановить покупку"; CourseInfoPurchaseModalPurchaseErrorContactSupportSubject = "Ошибка при покупке курса"; CourseInfoPurchaseModalPurchaseSuccessStatusTitle = "Оплата прошла успешно"; @@ -827,7 +827,7 @@ PrivacyPolicyTitle = "Условия конфиденциальности"; TermsOfServiceLink = "https://welcome.stepik.org/ru/terms"; PrivacyPolicyLink = "https://welcome.stepik.org/ru/privacy"; HelpCenterTitle = "Справочный центр"; -HelpCenterLink = "https://support.stepik.org/hc/ru"; +HelpCenterLink = "https://help.stepik.org/"; ContactSupportTitle = "Написать в поддержку"; ContactSupportSubject = "Обратная связь о приложении Stepik iOS"; ContactSupportMessageBody = "Я делаю следующее:\n\n1.\n2.\n3.\n\nПроисходит вот что:\n\nЯ ожидаю:\n\n=======\nПожалуйста, не удаляйте эту информацию\n=======\nВерсия приложения: %@\nStepik ID: %@"; @@ -1037,10 +1037,10 @@ StepARQuickLookUnsupportedAlertMessage = "Ваше устройство не п StepDisabledStudentTitle = "Увидеть задачу пока нельзя"; StepDisabledStudentMessage = "Напишите авторам курса, чтобы они обратили внимание на настройки %@.

Возможно, через какое-то время доступ восстановится."; StepDisabledTeacherTitle = "Сейчас учащиеся не могут просмотреть эту задачу"; -StepDisabledTeacherInCourseMessage = "Чтобы учащиеся увидели эту задачу, измените тип курса на %@.

В шаге использована платная функциональность. О тарифных планах."; +StepDisabledTeacherInCourseMessage = "Чтобы учащиеся увидели эту задачу, измените тип курса на %@.

В шаге использована платная функциональность. О тарифных планах."; StepDisabledTeacherInCoursePlanProTitle = "PRO или сделайте его платным"; StepDisabledTeacherInCoursePlanEnterpriseTitle = "Enterprise"; -StepDisabledTeacherNoCourseMessage = "Чтобы учащиеся увидели эту задачу, добавьте урок в %@.

В шаге использована платная функциональность. О тарифных планах."; +StepDisabledTeacherNoCourseMessage = "Чтобы учащиеся увидели эту задачу, добавьте урок в %@.

В шаге использована платная функциональность. О тарифных планах."; StepDisabledTeacherNoCoursePlanProTitle = "платный или PRO-курс"; StepDisabledTeacherNoCoursePlanEnterpriseTitle = "Enterprise-курс"; StepPosition = "Шаг %@"; diff --git a/StepicTests/Info-Develop.plist b/StepicTests/Info-Develop.plist index a7fe6160d3..f16b5e37dd 100644 --- a/StepicTests/Info-Develop.plist +++ b/StepicTests/Info-Develop.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.219-develop + 1.219.2-develop CFBundleSignature ???? CFBundleVersion - 435 + 437 diff --git a/StepicTests/Info-Production.plist b/StepicTests/Info-Production.plist index f5b9fb02f6..5508f3b03b 100644 --- a/StepicTests/Info-Production.plist +++ b/StepicTests/Info-Production.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.219 + 1.219.2 CFBundleSignature ???? CFBundleVersion - 435 + 437 diff --git a/StepicTests/Info-Release.plist b/StepicTests/Info-Release.plist index 9e8df74776..d86cc2a941 100644 --- a/StepicTests/Info-Release.plist +++ b/StepicTests/Info-Release.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.219-release + 1.219.2-release CFBundleSignature ???? CFBundleVersion - 435 + 437 diff --git a/StepicUITests/Info-Develop.plist b/StepicUITests/Info-Develop.plist index 2a5a5f0ff3..bac3b6b782 100644 --- a/StepicUITests/Info-Develop.plist +++ b/StepicUITests/Info-Develop.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219-develop + 1.219.2-develop CFBundleVersion - 435 + 437 diff --git a/StepicUITests/Info-Production.plist b/StepicUITests/Info-Production.plist index 51ba2b70d0..8462164916 100644 --- a/StepicUITests/Info-Production.plist +++ b/StepicUITests/Info-Production.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219 + 1.219.2 CFBundleVersion - 435 + 437 diff --git a/StepicUITests/Info-Release.plist b/StepicUITests/Info-Release.plist index 1d7193bef6..2720639f6b 100644 --- a/StepicUITests/Info-Release.plist +++ b/StepicUITests/Info-Release.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219-release + 1.219.2-release CFBundleVersion - 435 + 437 diff --git a/StepicWidget/Info-Develop.plist b/StepicWidget/Info-Develop.plist index 789f51dc01..1c97c7d59b 100644 --- a/StepicWidget/Info-Develop.plist +++ b/StepicWidget/Info-Develop.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219-develop + 1.219.2-develop CFBundleVersion - 435 + 437 NSExtension NSExtensionPointIdentifier diff --git a/StepicWidget/Info-Production.plist b/StepicWidget/Info-Production.plist index 77b88d5237..d04d5f54bc 100644 --- a/StepicWidget/Info-Production.plist +++ b/StepicWidget/Info-Production.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219 + 1.219.2 CFBundleVersion - 435 + 437 NSExtension NSExtensionPointIdentifier diff --git a/StepicWidget/Info-Release.plist b/StepicWidget/Info-Release.plist index 8f1cbe5227..e51e058f45 100644 --- a/StepicWidget/Info-Release.plist +++ b/StepicWidget/Info-Release.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.219-release + 1.219.2-release CFBundleVersion - 435 + 437 NSExtension NSExtensionPointIdentifier diff --git a/StickerPackExtension/Info-Develop.plist b/StickerPackExtension/Info-Develop.plist index 7d6d880481..2b87af752c 100644 --- a/StickerPackExtension/Info-Develop.plist +++ b/StickerPackExtension/Info-Develop.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.219-develop + 1.219.2-develop CFBundleVersion - 435 + 437 UIRequiredDeviceCapabilities arm64 diff --git a/StickerPackExtension/Info-Production.plist b/StickerPackExtension/Info-Production.plist index bdeaec1b46..a5d87b3eba 100644 --- a/StickerPackExtension/Info-Production.plist +++ b/StickerPackExtension/Info-Production.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.219 + 1.219.2 CFBundleVersion - 435 + 437 UIRequiredDeviceCapabilities arm64 diff --git a/StickerPackExtension/Info-Release.plist b/StickerPackExtension/Info-Release.plist index 258e224c30..6f04310b3a 100644 --- a/StickerPackExtension/Info-Release.plist +++ b/StickerPackExtension/Info-Release.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.219-release + 1.219.2-release CFBundleVersion - 435 + 437 UIRequiredDeviceCapabilities arm64 diff --git a/fastlane/metadata/Stepic/en-GB/support_url.txt b/fastlane/metadata/Stepic/en-GB/support_url.txt index f8c32cb433..1b81b0ba65 100644 --- a/fastlane/metadata/Stepic/en-GB/support_url.txt +++ b/fastlane/metadata/Stepic/en-GB/support_url.txt @@ -1 +1 @@ -https://support.stepik.org/hc/en-us +https://help.stepik.org/ diff --git a/fastlane/metadata/Stepic/en-US/support_url.txt b/fastlane/metadata/Stepic/en-US/support_url.txt index f8c32cb433..1b81b0ba65 100644 --- a/fastlane/metadata/Stepic/en-US/support_url.txt +++ b/fastlane/metadata/Stepic/en-US/support_url.txt @@ -1 +1 @@ -https://support.stepik.org/hc/en-us +https://help.stepik.org/ diff --git a/fastlane/metadata/Stepic/ru/support_url.txt b/fastlane/metadata/Stepic/ru/support_url.txt index 6581107506..1b81b0ba65 100644 --- a/fastlane/metadata/Stepic/ru/support_url.txt +++ b/fastlane/metadata/Stepic/ru/support_url.txt @@ -1 +1 @@ -https://support.stepik.org/hc/ru +https://help.stepik.org/