Merge pull request #3 from messeb/feature/swift-4.2-support

Updates project to Swift 4.2

Author: messeb

Gemfile

@@ -2,4 +2,4 @@ ruby "~> 2.5.1"
 
 source 'https://rubygems.org'
 gem 'cocoapods', '~> 1.5.3'
-gem 'fastlane', '~> 2.101.1'
+gem 'fastlane', '~> 2.107.0'

Gemfile.lock

@@ -36,12 +36,12 @@ GEM
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -58,15 +58,15 @@ GEM
     emoji_regex (0.1.1)
     escape (0.0.4)
     excon (0.62.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.3)
-    fastlane (2.101.1)
+    fastimage (2.1.4)
+    fastlane (2.107.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -90,7 +90,7 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -99,23 +99,24 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.7, < 2.0.0)
-      xcpretty (~> 0.2.8)
+      xcodeproj (>= 1.6.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-api-client (0.23.4)
+    google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.4)
+      signet (~> 0.9)
+    googleauth (0.6.7)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
@@ -150,10 +151,10 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.2.0)
-    rubyzip (1.2.1)
+    ruby-macho (1.3.1)
+    rubyzip (1.2.2)
     security (0.1.3)
-    signet (0.8.1)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -178,13 +179,13 @@ GEM
     unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.9)
+    xcodeproj (1.7.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.5)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
@@ -194,10 +195,10 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (~> 1.5.3)
-  fastlane (~> 2.101.1)
+  fastlane (~> 2.107.0)
 
 RUBY VERSION
    ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.3
+   1.16.6

Podfile

@@ -3,23 +3,23 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'iOSProjectSetup' do
-    pod 'Alamofire', '~> 4.7'
-    pod 'RxSwift', '~> 4.0'
-    pod 'RxCocoa', '~> 4.0'
+    pod 'Alamofire', '4.7.3'
+    pod 'RxSwift', '4.3.1'
+    pod 'RxCocoa', '4.3.1'
 end
 
 target 'iOSProjectSetupTests' do
-    pod 'RxSwift', '~> 4.0'
-    pod 'RxCocoa', '~> 4.0'
-    pod 'RxBlocking', '~> 4.0'
-    pod 'RxTest',     '~> 4.0'
+    pod 'RxSwift', '4.3.1'
+    pod 'RxCocoa', '4.3.1'
+    pod 'RxBlocking', '4.3.1'
+    pod 'RxTest',     '4.3.1'
 end
 
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
 
-            config.build_settings['SWIFT_VERSION'] = '4.1.2'
+            config.build_settings['SWIFT_VERSION'] = '4.2'
             config.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = '$(inherited)'
 
             config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = ''

Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
   - Alamofire (4.7.3)
-  - RxBlocking (4.2.0):
+  - RxBlocking (4.3.1):
     - RxSwift (~> 4.0)
-  - RxCocoa (4.2.0):
+  - RxCocoa (4.3.1):
     - RxSwift (~> 4.0)
-  - RxSwift (4.2.0)
-  - RxTest (4.2.0):
+  - RxSwift (4.3.1)
+  - RxTest (4.3.1):
     - RxSwift (~> 4.0)
 
 DEPENDENCIES:
-  - Alamofire (~> 4.7)
-  - RxBlocking (~> 4.0)
-  - RxCocoa (~> 4.0)
-  - RxSwift (~> 4.0)
-  - RxTest (~> 4.0)
+  - Alamofire (= 4.7.3)
+  - RxBlocking (= 4.3.1)
+  - RxCocoa (= 4.3.1)
+  - RxSwift (= 4.3.1)
+  - RxTest (= 4.3.1)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -25,11 +25,11 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
-  RxBlocking: e339d8a6e752e25ade95ff858466c55436668f59
-  RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa
-  RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104
-  RxTest: 8da864c0ee47534f586ff18fb0c7e5b2f1fe5023
+  RxBlocking: 64c051285261ca2339481e91b5f70eb06b03660a
+  RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
+  RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
+  RxTest: ea97a208826906f3904c0debdd09575ebcbfe216
 
-PODFILE CHECKSUM: 8cf7999a2a6d268a427e62f68a46dd671863948a
+PODFILE CHECKSUM: 634bc9d5f8be7415a77d19fe007af7ab1708d87a
 
 COCOAPODS: 1.5.3

iOSProjectSetup.xcodeproj/project.pbxproj

@@ -665,7 +665,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.iOSProjectSetup;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -687,7 +687,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.iOSProjectSetup;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -710,7 +710,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.iOSProjectSetupTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSProjectSetup.app/iOSProjectSetup";
 			};
@@ -734,7 +734,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.iOSProjectSetupTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSProjectSetup.app/iOSProjectSetup";
 			};

iOSProjectSetup.xcworkspace/xcuserdata/smessingfeld.xcuserdatad/UserInterfaceState.xcuserstate

@@ -6,8 +6,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow? = UIWindow(frame: UIScreen.main.bounds)
     var project = IOSProjectSetup()
 
-    func application(_ application: UIApplication,
-                     didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    private func application(_ application: UIApplication,
+                             didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         guard let window = window else {
             fatalError("Window is nil");
         }