From 0e3028956a6d1fe021a5bc2186bb41715ba458d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Caetano?= Date: Thu, 12 Jul 2018 13:35:26 -0400 Subject: [PATCH] Upgrading Dev dependencies - Fix: upgrade SwiftLint and migrate warnings - Upgrading RxCocoa to 4.2.0 - Upgrading RxBlocking to 4.2.0 - Upgrading AppSwizzle to 1.3 --- Cartfile.resolved | 2 +- Example/Podfile | 2 +- Example/Podfile.lock | 28 +++++++++----------------- Example/ReCaptcha_Tests/.swiftlint.yml | 1 + 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index ace1f99..b564d8d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "ReactiveX/RxSwift" "4.1.2" +github "ReactiveX/RxSwift" "4.2.0" github "antitypical/Result" "3.2.4" diff --git a/Example/Podfile b/Example/Podfile index 6a42110..df9bc4a 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -11,7 +11,7 @@ target 'ReCaptcha_Example' do target 'ReCaptcha_Tests' do inherit! :search_paths - pod 'AppSwizzle', :git => 'https://github.com/fjcaetano/AppSwizzle.git', :branch => 'swift4' + pod 'AppSwizzle', '~> 1.3' pod 'RxBlocking', '~> 4.0' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index ea7e2da..fbd7458 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,43 +1,35 @@ PODS: - - AppSwizzle (1.2) + - AppSwizzle (1.3.1) - ReCaptcha/Core (1.2) - ReCaptcha/RxSwift (1.2): - ReCaptcha/Core - RxSwift (~> 4.0) - - RxBlocking (4.1.1): + - RxBlocking (4.2.0): - RxSwift (~> 4.0) - - RxCocoa (4.1.1): + - RxCocoa (4.2.0): - RxSwift (~> 4.0) - RxSwift (4.2.0) - - SwiftLint (0.24.1) + - SwiftLint (0.26.0) DEPENDENCIES: - - AppSwizzle (from `https://github.com/fjcaetano/AppSwizzle.git`, branch `swift4`) + - AppSwizzle (~> 1.3) - ReCaptcha/RxSwift (from `../`) - RxBlocking (~> 4.0) - RxCocoa (~> 4.0) - SwiftLint (~> 0.24) EXTERNAL SOURCES: - AppSwizzle: - :branch: swift4 - :git: https://github.com/fjcaetano/AppSwizzle.git ReCaptcha: :path: ../ -CHECKOUT OPTIONS: - AppSwizzle: - :commit: c432a73e43779d20ef8e8a589aabd9622b7b6a5d - :git: https://github.com/fjcaetano/AppSwizzle.git - SPEC CHECKSUMS: - AppSwizzle: bbd3782652fc426ce59c045a92ec61d36f261984 + AppSwizzle: db36e436f56110d93e5ae0147683435df593cabc ReCaptcha: ffa108380b3eaca6c1448dcfe38eb5dab8083a67 - RxBlocking: 22e7d7b86a1c0c42164a30d64f56f97128b4ffab - RxCocoa: fd0862fd2df95fa55562ad28ffd2522c25eb4a85 + RxBlocking: e339d8a6e752e25ade95ff858466c55436668f59 + RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104 - SwiftLint: 2e4b89feed5909c42c3735bbd6745f4345c4b772 + SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764 -PODFILE CHECKSUM: 3ae211ad7c1b9c86749b013587aa4b63661f345e +PODFILE CHECKSUM: 0b5282c7433d7f669094e5e24684866bae899e4b COCOAPODS: 1.4.0 diff --git a/Example/ReCaptcha_Tests/.swiftlint.yml b/Example/ReCaptcha_Tests/.swiftlint.yml index 9fd407a..8967e41 100644 --- a/Example/ReCaptcha_Tests/.swiftlint.yml +++ b/Example/ReCaptcha_Tests/.swiftlint.yml @@ -4,3 +4,4 @@ disabled_rules: - force_unwrapping - explicit_top_level_acl - function_body_length + - identifier_name