Skip to content

Commit

Permalink
Merge pull request #1051 from StepicOrg/release/1.191
Browse files Browse the repository at this point in the history
Release 1.191
  • Loading branch information
ivan-magda authored Sep 23, 2021
2 parents bff7089 + cd8ab79 commit 4e7b1d1
Show file tree
Hide file tree
Showing 66 changed files with 2,556 additions and 206 deletions.
8 changes: 8 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ only_rules:
- deployment_target
- discarded_notification_center_observer
- discouraged_direct_init
- discouraged_none_name
- discouraged_object_literal
- duplicate_enum_cases
- duplicate_imports
- duplicated_key_in_dictionary_literal
- dynamic_inline
- empty_collection_literal
- empty_count
Expand Down Expand Up @@ -214,6 +216,9 @@ discarded_notification_center_observer:
discouraged_direct_init:
severity: error

discouraged_none_name:
severity: warning

discouraged_object_literal:
severity: error

Expand All @@ -223,6 +228,9 @@ duplicate_enum_cases:
duplicate_imports:
severity: error

duplicated_key_in_dictionary_literal:
severity: error

dynamic_inline:
severity: error

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
ruby "2.6.5"

gem "fastlane", "2.193.1"
gem "fastlane", "2.194.0"
gem "cocoapods", "1.11.2"
gem "generamba", "1.5.0"

Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.497.0)
aws-partitions (1.502.0)
aws-sdk-core (3.121.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand All @@ -25,7 +25,7 @@ GEM
aws-sdk-kms (1.48.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.102.0)
aws-sdk-s3 (1.103.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
Expand Down Expand Up @@ -86,7 +86,7 @@ GEM
ethon (0.14.0)
ffi (>= 1.15.0)
excon (0.85.0)
faraday (1.7.1)
faraday (1.7.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -111,7 +111,7 @@ GEM
faraday_middleware (1.1.0)
faraday (~> 1.0)
fastimage (2.2.5)
fastlane (2.193.1)
fastlane (2.194.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -261,7 +261,7 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unf_ext (0.0.8)
webrick (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.21.0)
Expand All @@ -282,7 +282,7 @@ PLATFORMS

DEPENDENCIES
cocoapods (= 1.11.2)
fastlane (= 2.193.1)
fastlane (= 2.194.0)
fastlane-plugin-firebase_app_distribution
generamba (= 1.5.0)

Expand Down
36 changes: 23 additions & 13 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ def shared_pods
pod 'SwiftyJSON', '5.0.0'
pod 'SDWebImage', '5.11.0'
pod 'SVGKit', :git => 'https://github.com/SVGKit/SVGKit.git', :branch => '2.x'
pod 'DeviceKit', '4.4.0'
pod 'DeviceKit', '4.5.0'
pod 'PromiseKit', '6.15.3'
pod 'SwiftLint', '0.43.1'
pod 'SwiftLint', '0.44.0'

if ENV['FASTLANE_BETA_PROFILE'] == 'true'
pod 'FLEX',
Expand All @@ -43,14 +43,14 @@ def all_pods
pod 'SnapKit', '5.0.1'

# Firebase
pod 'Firebase/Core', '8.6.0'
pod 'Firebase/Messaging', '8.6.0'
pod 'Firebase/Analytics', '8.6.0'
pod 'Firebase/Crashlytics', '8.6.0'
pod 'Firebase/RemoteConfig', '8.6.0'

pod 'YandexMobileMetrica/Dynamic', '3.15.1'
pod 'Amplitude', '8.3.0'
pod 'Firebase/Core', '8.7.0'
pod 'Firebase/Messaging', '8.7.0'
pod 'Firebase/Analytics', '8.7.0'
pod 'Firebase/Crashlytics', '8.7.0'
pod 'Firebase/RemoteConfig', '8.7.0'

pod 'YandexMobileMetrica/Dynamic', '3.17.0'
pod 'Amplitude', '8.3.1'
pod 'Branch', '1.39.3'

pod 'BEMCheckBox', '1.4.1'
Expand All @@ -66,11 +66,11 @@ def all_pods
pod 'FBSDKLoginKit', '8.2.0'
pod 'GoogleSignIn', '5.0.2'

pod 'Presentr', '1.9'
pod 'Presentr', :git => 'https://github.com/ivan-magda/Presentr.git', :tag => 'v1.9.1'
pod 'PanModal', :git => 'https://github.com/ivan-magda/PanModal.git', :branch => 'remove-presenting-appearance-transitions'

pod 'Agrume', '5.6.13'
pod 'Highlightr', :git => 'https://github.com/ivan-magda/Highlightr.git', :branch => 'master'
pod 'Highlightr', :git => 'https://github.com/ivan-magda/Highlightr.git', :tag => 'v2.1.3'
pod 'TTTAttributedLabel', '2.0.0'
pod 'lottie-ios', '3.2.3'
pod 'Koloda', '5.0.1'
Expand All @@ -85,7 +85,7 @@ end

def testing_pods
pod 'Quick', '4.0.0'
pod 'Nimble', '9.2.0'
pod 'Nimble', '9.2.1'
pod 'Mockingjay', '3.0.0-alpha.1'
end

Expand All @@ -98,3 +98,13 @@ target 'Stepic' do
testing_pods
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
end
end
end
end
Loading

0 comments on commit 4e7b1d1

Please sign in to comment.