Skip to content

Commit

Permalink
Merge pull request #660 from StepicOrg/release/1.113
Browse files Browse the repository at this point in the history
Release 1.113
  • Loading branch information
ivan-magda authored Feb 18, 2020
2 parents e846015 + efadc56 commit 5385157
Show file tree
Hide file tree
Showing 38 changed files with 313 additions and 327 deletions.
7 changes: 7 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ whitelist_rules:
- optional_enum_case_matching
- overridden_super_call
- override_in_extension
- prohibited_nan_comparison
- prefer_self_type_over_type_of_self
- prefixed_toplevel_constant
- private_over_fileprivate
Expand All @@ -123,6 +124,7 @@ whitelist_rules:
- redundant_string_enum_value
- redundant_type_annotation
- redundant_void_return
- return_value_from_void_function
- return_arrow_whitespace
- shorthand_operator
- single_test_class
Expand All @@ -140,6 +142,7 @@ whitelist_rules:
- trailing_newline
- trailing_semicolon
- trailing_whitespace
- tuple_pattern
- type_name
- unavailable_function
- unneeded_break_in_switch
Expand All @@ -151,6 +154,7 @@ whitelist_rules:
- unused_optional_binding
- vertical_whitespace_closing_braces
- vertical_whitespace_opening_braces
- void_function_in_ternary
- void_return
- weak_delegate
- yoda_condition
Expand Down Expand Up @@ -443,6 +447,9 @@ trailing_newline:
trailing_semicolon:
severity: error

tuple_pattern:
severity: error

type_name:
severity: error
max_length: 64
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GEM
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.4.1)
Expand Down Expand Up @@ -177,7 +177,7 @@ GEM
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.7)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
Expand Down
12 changes: 6 additions & 6 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def shared_pods
pod 'Crashlytics', '3.14.0'
pod 'DeviceKit', '3.0.0'
pod 'PromiseKit', '6.13.0'
pod 'SwiftLint', '0.38.2'
pod 'SwiftLint', '0.39.1'
pod 'Reveal-SDK', :configurations => ['Debug']
end

Expand All @@ -30,10 +30,10 @@ def all_pods
pod 'SnapKit', '5.0.1'

# Firebase
pod 'Firebase/Core', '6.14.0'
pod 'Firebase/Messaging' , '6.14.0'
pod 'Firebase/Analytics' , '6.14.0'
pod 'Firebase/RemoteConfig', '6.14.0'
pod 'Firebase/Core', '6.17.0'
pod 'Firebase/Messaging' , '6.17.0'
pod 'Firebase/Analytics' , '6.17.0'
pod 'Firebase/RemoteConfig', '6.17.0'

pod 'YandexMobileMetrica/Dynamic', '3.9.4'
pod 'Amplitude-iOS', '4.9.3'
Expand Down Expand Up @@ -64,7 +64,7 @@ def all_pods
pod 'ActionSheetPicker-3.0', '2.4.0'
pod 'Nuke', '8.3.1'
pod 'STRegex', '2.1.0'
pod 'Tabman', '2.6.3'
pod 'Tabman', '2.8.0'
pod 'SwiftDate', '6.1.0'
end

Expand Down
166 changes: 86 additions & 80 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ PODS:
- Alamofire (4.9.1)
- Amplitude-iOS (4.9.3)
- Atributika (4.9.4)
- AutoInsetter (1.8.0)
- BEMCheckBox (1.4.1)
- Branch (0.31.0):
- Branch/Core (= 0.31.0)
Expand Down Expand Up @@ -33,93 +32,98 @@ PODS:
- FBSDKLoginKit/Login (= 5.13.0)
- FBSDKLoginKit/Login (5.13.0):
- FBSDKCoreKit (~> 5.0)
- Firebase/Analytics (6.14.0):
- Firebase/Analytics (6.17.0):
- Firebase/Core
- Firebase/Core (6.14.0):
- Firebase/Core (6.17.0):
- Firebase/CoreOnly
- FirebaseAnalytics (= 6.1.7)
- Firebase/CoreOnly (6.14.0):
- FirebaseCore (= 6.5.0)
- Firebase/Messaging (6.14.0):
- FirebaseAnalytics (= 6.2.2)
- Firebase/CoreOnly (6.17.0):
- FirebaseCore (= 6.6.2)
- Firebase/Messaging (6.17.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.1.10)
- Firebase/RemoteConfig (6.14.0):
- FirebaseMessaging (~> 4.2.1)
- Firebase/RemoteConfig (6.17.0):
- Firebase/CoreOnly
- FirebaseRemoteConfig (~> 4.4.6)
- FirebaseRemoteConfig (~> 4.4.7)
- FirebaseABTesting (3.1.2):
- FirebaseAnalyticsInterop (~> 1.3)
- FirebaseCore (~> 6.1)
- Protobuf (>= 3.9.2, ~> 3.9)
- FirebaseAnalytics (6.1.7):
- FirebaseCore (~> 6.5)
- FirebaseInstanceID (~> 4.2)
- GoogleAppMeasurement (= 6.1.7)
- FirebaseAnalytics (6.2.2):
- FirebaseCore (~> 6.6)
- FirebaseInstanceID (~> 4.3)
- GoogleAppMeasurement (= 6.2.2)
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (= 0.3.9011)
- FirebaseAnalyticsInterop (1.4.0)
- FirebaseCore (6.5.0):
- FirebaseCoreDiagnostics (~> 1.0)
- FirebaseCoreDiagnosticsInterop (~> 1.0)
- GoogleUtilities/Environment (~> 6.4)
- GoogleUtilities/Logger (~> 6.4)
- FirebaseCoreDiagnostics (1.1.2):
- FirebaseCoreDiagnosticsInterop (~> 1.0)
- GoogleDataTransportCCTSupport (~> 1.0)
- GoogleUtilities/Environment (~> 6.2)
- GoogleUtilities/Logger (~> 6.2)
- FirebaseAnalyticsInterop (1.5.0)
- FirebaseCore (6.6.2):
- FirebaseCoreDiagnostics (~> 1.2)
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- FirebaseCoreDiagnostics (1.2.0):
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleDataTransportCCTSupport (~> 1.3)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- nanopb (~> 0.3.901)
- FirebaseCoreDiagnosticsInterop (1.1.0)
- FirebaseInstanceID (4.2.8):
- FirebaseCore (~> 6.5)
- GoogleUtilities/Environment (~> 6.4)
- GoogleUtilities/UserDefaults (~> 6.4)
- FirebaseMessaging (4.1.10):
- FirebaseAnalyticsInterop (~> 1.3)
- FirebaseCore (~> 6.2)
- FirebaseInstanceID (~> 4.1)
- GoogleUtilities/AppDelegateSwizzler (~> 6.2)
- GoogleUtilities/Environment (~> 6.2)
- GoogleUtilities/Reachability (~> 6.2)
- GoogleUtilities/UserDefaults (~> 6.2)
- FirebaseCoreDiagnosticsInterop (1.2.0)
- FirebaseInstallations (1.1.0):
- FirebaseCore (~> 6.6)
- GoogleUtilities/UserDefaults (~> 6.5)
- PromisesObjC (~> 1.2)
- FirebaseInstanceID (4.3.1):
- FirebaseCore (~> 6.6)
- FirebaseInstallations (~> 1.0)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/UserDefaults (~> 6.5)
- FirebaseMessaging (4.2.1):
- FirebaseAnalyticsInterop (~> 1.5)
- FirebaseCore (~> 6.6)
- FirebaseInstanceID (~> 4.3)
- GoogleUtilities/AppDelegateSwizzler (~> 6.5)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Reachability (~> 6.5)
- GoogleUtilities/UserDefaults (~> 6.5)
- Protobuf (>= 3.9.2, ~> 3.9)
- FirebaseRemoteConfig (4.4.6):
- FirebaseRemoteConfig (4.4.7):
- FirebaseABTesting (~> 3.1)
- FirebaseAnalyticsInterop (~> 1.4)
- FirebaseCore (~> 6.2)
- FirebaseInstanceID (~> 4.2)
- GoogleUtilities/Environment (~> 6.2)
- "GoogleUtilities/NSData+zlib (~> 6.2)"
- Protobuf (>= 3.9.2, ~> 3.9)
- GoogleAppMeasurement (6.1.7):
- GoogleAppMeasurement (6.2.2):
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (= 0.3.9011)
- GoogleDataTransport (3.2.0)
- GoogleDataTransportCCTSupport (1.2.3):
- GoogleDataTransport (~> 3.2)
- GoogleDataTransport (4.0.0)
- GoogleDataTransportCCTSupport (1.4.0):
- GoogleDataTransport (~> 4.0)
- nanopb (~> 0.3.901)
- GoogleUtilities/AppDelegateSwizzler (6.4.0):
- GoogleUtilities/AppDelegateSwizzler (6.5.1):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.4.0)
- GoogleUtilities/Logger (6.4.0):
- GoogleUtilities/Environment (6.5.1)
- GoogleUtilities/Logger (6.5.1):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (6.4.0):
- GoogleUtilities/MethodSwizzler (6.5.1):
- GoogleUtilities/Logger
- GoogleUtilities/Network (6.4.0):
- GoogleUtilities/Network (6.5.1):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.4.0)"
- GoogleUtilities/Reachability (6.4.0):
- "GoogleUtilities/NSData+zlib (6.5.1)"
- GoogleUtilities/Reachability (6.5.1):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.4.0):
- GoogleUtilities/UserDefaults (6.5.1):
- GoogleUtilities/Logger
- HexColors (2.3.0)
- Highlightr (2.1.0)
Expand Down Expand Up @@ -155,7 +159,8 @@ PODS:
- PromiseKit/CorePromise
- PromiseKit/UIKit (6.13.0):
- PromiseKit/CorePromise
- Protobuf (3.11.2)
- PromisesObjC (1.2.8)
- Protobuf (3.11.3)
- Quick (2.2.0)
- Reveal-SDK (24)
- SDWebImage (5.5.2):
Expand All @@ -167,11 +172,10 @@ PODS:
- CocoaLumberjack (~> 3.0)
- SVProgressHUD (2.2.5)
- SwiftDate (6.1.0)
- SwiftLint (0.38.2)
- SwiftLint (0.39.1)
- SwiftyGif (5.2.0)
- SwiftyJSON (5.0.0)
- Tabman (2.6.3):
- AutoInsetter (~> 1.8.0)
- Tabman (2.8.0):
- Pageboy (~> 3.5.0)
- TSMessages (0.9.13):
- HexColors (~> 2.3.0)
Expand Down Expand Up @@ -203,10 +207,10 @@ DEPENDENCIES:
- Fabric (= 1.10.2)
- FBSDKCoreKit (= 5.13.0)
- FBSDKLoginKit (= 5.13.0)
- Firebase/Analytics (= 6.14.0)
- Firebase/Core (= 6.14.0)
- Firebase/Messaging (= 6.14.0)
- Firebase/RemoteConfig (= 6.14.0)
- Firebase/Analytics (= 6.17.0)
- Firebase/Core (= 6.17.0)
- Firebase/Messaging (= 6.17.0)
- Firebase/RemoteConfig (= 6.17.0)
- Highlightr (= 2.1.0)
- IQKeyboardManagerSwift (= 6.5.4)
- Kanna (= 5.0.0)
Expand All @@ -226,9 +230,9 @@ DEPENDENCIES:
- SVGKit (from `https://github.com/SVGKit/SVGKit.git`, branch `2.x`)
- SVProgressHUD (= 2.2.5)
- SwiftDate (= 6.1.0)
- SwiftLint (= 0.38.2)
- SwiftLint (= 0.39.1)
- SwiftyJSON (= 5.0.0)
- Tabman (= 2.6.3)
- Tabman (= 2.8.0)
- TSMessages (from `https://github.com/KrauseFx/TSMessages.git`)
- TTTAttributedLabel (= 2.0.0)
- TUSafariActivity (= 1.0.4)
Expand All @@ -242,7 +246,6 @@ SPEC REPOS:
- Alamofire
- Amplitude-iOS
- Atributika
- AutoInsetter
- BEMCheckBox
- Branch
- Charts
Expand All @@ -262,6 +265,7 @@ SPEC REPOS:
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseCoreDiagnosticsInterop
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
- FirebaseRemoteConfig
Expand All @@ -284,6 +288,7 @@ SPEC REPOS:
- pop
- Presentr
- PromiseKit
- PromisesObjC
- Protobuf
- Quick
- Reveal-SDK
Expand Down Expand Up @@ -323,7 +328,6 @@ SPEC CHECKSUMS:
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
Amplitude-iOS: 122e026c44db8460e5efcf84859aa290a0ae9786
Atributika: 643a248e2dd8b4d74b23b53ea31393cab0a01d94
AutoInsetter: 0b90ca74e36561c340129045a3722c51a0b15c58
BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
Branch: d2e1611afa9ea9aa36fa1996df7f38ca2c3eb03e
Charts: 74c9f256eaf0460c0c416522d1cf8c634ea6b286
Expand All @@ -336,20 +340,21 @@ SPEC CHECKSUMS:
Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
FBSDKCoreKit: b1645dba3dfdba6102f2d4026fdbfca8114dc229
FBSDKLoginKit: 4aca55e93a63b1ff0cb9446208d49e32c13ab24a
Firebase: 0219bb4782eb1406f1b9b0628a2e625484ce910d
Firebase: 2672e5636b42f977177716317e68346ae5e9de25
FirebaseABTesting: 0d10f3cdc3fa00f3f175b5b56c1003c8e888299f
FirebaseAnalytics: f68b9f3f1241385129ae0a83b63627fc420c05e5
FirebaseAnalyticsInterop: d48b6ab67bcf016a05e55b71fc39c61c0cb6b7f3
FirebaseCore: 632e05cc5e1199d9147122c16d92305eb04c34bd
FirebaseCoreDiagnostics: 511f4f3ed7d440bb69127e8b97c2bc8befae639e
FirebaseCoreDiagnosticsInterop: e9b1b023157e3a2fc6418b5cb601e79b9af7b3a0
FirebaseInstanceID: ce993a3c3670a8f5d47ce371ac5d143c560608c5
FirebaseMessaging: 089b7a4991425783384acc8bcefcd78c0af913bd
FirebaseRemoteConfig: c11d74d8b1ff8463b587fc8899d92ee089f9a691
GoogleAppMeasurement: db118eb61a97dd8c4f7014e368d3c335cbbcf80a
GoogleDataTransport: 8e9b210c97d55fbff306cc5468ff91b9cb32dcf5
GoogleDataTransportCCTSupport: 202d7cdf9c4a7d81a2bb7f7e7e1ba6faa421b1f2
GoogleUtilities: 29bd0d8f850efbd28cff6d99e8b7da1f8d236bcf
FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
FirebaseCore: a1dd9dd6355a8356dd30a8f076839e242285a81c
FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
FirebaseInstallations: 575cd32f2aec0feeb0e44f5d0110a09e5e60b47b
FirebaseInstanceID: 031d7d0c8e7b5c030bbeb4d2a690550375e83fec
FirebaseMessaging: 9e23f9d603b1fb71ccbeb48d79bf0d4ba0272c84
FirebaseRemoteConfig: 4890e58b0e33c8328b8c5e8b7a5a237b9d851d8e
GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
GoogleDataTransport: 47fe3b8e1673e5187dfd615656a3c5034f150d69
GoogleDataTransportCCTSupport: 36f69887fd212db6d7ef4dd45ba44523717a434e
GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275
HexColors: 6ad3947c3447a055a3aa8efa859def096351fe5f
Highlightr: 595f3e100737c8de41113385da8bd0b5b65212c6
IQKeyboardManagerSwift: 2dde0fc70110e8eac7ccce2a46fdbec6a850b414
Expand All @@ -365,7 +370,8 @@ SPEC CHECKSUMS:
pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
Presentr: 7078d7eb5d1661ebeaae60c9e42a1e534de1b993
PromiseKit: c8668a559f26c98277a543192c51bc38dd2dfc76
Protobuf: dd1aaea7140debfe4dd0683fb8ef208e527ae153
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
Protobuf: 0e94afe3b47cb11876eb6aee296638711a24bf75
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
Reveal-SDK: 5d7e56b8f018c0a88b3a2c10bf68d598bbd3b071
SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca
Expand All @@ -374,17 +380,17 @@ SPEC CHECKSUMS:
SVGKit: 8a2fc74258bdb2abb54d3b65f3dd68b0277a9c4d
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SwiftDate: fa2bb3962056bb44047b4b85a30044e5eae30b03
SwiftLint: 8f5d2f903e1c9bcbc832fd16771e80a263ac6cbb
SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
SwiftyGif: b85c6b33a9411859d9e1db998b6a8214aea942df
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
Tabman: 63eae331ae7a9388ae389b1808f1939269fcdece
Tabman: f62ad94ee54a7d96e3fbab34f677d9ea4d38ece6
TSMessages: eb3cf27b6900684a21bad4fe9ea426e287b8c839
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
URITemplate: 58e0d47f967006c5d59888af5356c4a8ed3b197d
VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
YandexMobileMetrica: 1030df2959c886a7be3bc3d274eb54c8e86afd6f

PODFILE CHECKSUM: ba390ba6c2c2242b85e6dd46f53cc8dad466e12e
PODFILE CHECKSUM: 1fe1dfccefae881f76b2cbabadf3a8cf5460290b

COCOAPODS: 1.8.4
Loading

0 comments on commit 5385157

Please sign in to comment.