Migration to Swift 4.2

pixeldock · Sep 15, 2018 · 7367266 · 7367266
1 parent 3bd8104
commit 7367266
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 50 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" ~> 4.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "4.0.0"
+github "ReactiveX/RxSwift" "4.2.0"
diff --git a/Example/Podfile b/Example/Podfile
@@ -16,7 +16,7 @@ pod 'RxCocoa', :inhibit_warnings => true
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '4.1'
+            config.build_settings['SWIFT_VERSION'] = '4.2'
         end
     end
 end
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/RxCocoa/RxCocoa/Common/ControlTarget.swift b/Example/Pods/RxCocoa/RxCocoa/Common/ControlTarget.swift
diff --git a/Example/Pods/RxCocoa/RxCocoa/Deprecated.swift b/Example/Pods/RxCocoa/RxCocoa/Deprecated.swift
diff --git a/Example/Pods/RxCocoa/RxCocoa/iOS/NSTextStorage+Rx.swift b/Example/Pods/RxCocoa/RxCocoa/iOS/NSTextStorage+Rx.swift
diff --git a/Example/Pods/RxCocoa/RxCocoa/iOS/UIButton+Rx.swift b/Example/Pods/RxCocoa/RxCocoa/iOS/UIButton+Rx.swift
diff --git a/Example/Pods/RxCocoa/RxCocoa/iOS/UIControl+Rx.swift b/Example/Pods/RxCocoa/RxCocoa/iOS/UIControl+Rx.swift
diff --git a/Example/Pods/RxCocoa/RxCocoa/iOS/UITableView+Rx.swift b/Example/Pods/RxCocoa/RxCocoa/iOS/UITableView+Rx.swift
diff --git a/Example/RxAppState.xcodeproj/project.pbxproj b/Example/RxAppState.xcodeproj/project.pbxproj
@@ -54,7 +54,7 @@
 		80A0FA341FA86E4000ABD580 /* RxAppStateVCTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxAppStateVCTests.swift; sourceTree = "<group>"; };
 		80F95E691FA4AD1700812CD9 /* SecondaryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryViewController.swift; sourceTree = "<group>"; };
 		942E7BB1E0F57BA13D230B1F /* Pods-RxAppState_ExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAppState_ExampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxAppState_ExampleTests/Pods-RxAppState_ExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
-		999F5132162E03A75A164E14 /* RxAppState.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxAppState.podspec; path = ../RxAppState.podspec; sourceTree = "<group>"; };
+		999F5132162E03A75A164E14 /* RxAppState.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxAppState.podspec; path = ../RxAppState.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		A43A75CBF0FB8CA154A9B8C2 /* Pods_RxAppState_ExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAppState_ExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B91F9C532D741E43D651B1DE /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -221,11 +221,11 @@
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = NPY72H3Q84;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 					};
 					801A53471C9DA22600C38A16 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -502,7 +502,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -520,7 +520,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -537,7 +537,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pixeldock.RxAppState-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxAppState_Example.app/RxAppState_Example";
 			};
 			name = Debug;
@@ -554,7 +554,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pixeldock.RxAppState-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RxAppState_Example.app/RxAppState_Example";
 			};
 			name = Release;

diff --git a/Example/RxAppState/AppDelegate.swift b/Example/RxAppState/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Example/RxAppState/TestingAppDelegate.swift b/Example/RxAppState/TestingAppDelegate.swift
@@ -11,7 +11,7 @@ import UIKit
 class TestingAppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UIViewController()
         window?.makeKeyAndVisible()

diff --git a/Example/RxAppState/main.swift b/Example/RxAppState/main.swift
@@ -14,20 +14,14 @@ let isRunningTests = NSClassFromString("XCTestCase") != nil
 if isRunningTests {
     UIApplicationMain(
         CommandLine.argc,
-        UnsafeMutableRawPointer(CommandLine.unsafeArgv)
-            .bindMemory(
-                to: UnsafeMutablePointer<Int8>.self,
-                capacity: Int(CommandLine.argc)),
+        CommandLine.unsafeArgv,
         nil,
         NSStringFromClass(TestingAppDelegate.self)
     )
 } else {
     UIApplicationMain(
         CommandLine.argc,
-        UnsafeMutableRawPointer(CommandLine.unsafeArgv)
-            .bindMemory(
-                to: UnsafeMutablePointer<Int8>.self,
-                capacity: Int(CommandLine.argc)),
+        CommandLine.unsafeArgv,
         nil,
         NSStringFromClass(AppDelegate.self)
     )

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![License](https://img.shields.io/cocoapods/l/RxAppState.svg?style=flat)](http://cocoapods.org/pods/RxAppState)
 [![Platform](https://img.shields.io/cocoapods/p/RxAppState.svg?style=flat)](http://cocoapods.org/pods/RxAppState)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg?style=flat)](https://swift.org/)
+[![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg?style=flat)](https://swift.org/)
 [![Twitter](https://img.shields.io/badge/Twitter-@pixeldock-blue.svg?style=flat)](http://twitter.com/pixeldock)
 [![Blog](https://img.shields.io/badge/Blog-pixeldock-FF0066.svg?style=flat)](http://pixeldock.com/blog)
 
@@ -131,11 +131,12 @@ Swift 4.1
 If you are using Swift 2.3 please use RxAppState version 0.2.0  
 If you are using Swift 3.x please use RxAppState version 0.3.4
 If you are using Swift 4.0 please use RxAppState version 1.1.1
+If you are using Swift 4.1 please use RxAppState version 1.1.2
 
 
 ## Dependencies
-RxSwift 4.0  
-RxCocoa 4.0
+RxSwift 4.2 
+RxCocoa 4.2
 
 ## Integration
 ### CocoaPods
@@ -152,7 +153,7 @@ If Xcode complains about Swift versions add this to the end of your Podfile:
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '4.1'
+            config.build_settings['SWIFT_VERSION'] = '4.2'
         end
     end
 end

diff --git a/RxAppState.podspec b/RxAppState.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "RxAppState"
-s.version          = "1.1.2"
+s.version          = "1.2.0"
 s.summary          = "Handy RxSwift extensions to observe your app's state and view controllers' view-related notifications"
 s.description      = <<-DESC
 Transform the state of your App and UIViewController's view-related notifications into RxSwift Observables. Including convenience Observables for common scenarios.
@@ -17,7 +17,7 @@ s.requires_arc = true
 s.source_files = 'Pod/Classes/**/*'
 
 s.frameworks = 'Foundation'
-s.dependency 'RxSwift', '~> 4.0'
-s.dependency 'RxCocoa', '~> 4.0'
+s.dependency 'RxSwift', '~> 4.2'
+s.dependency 'RxCocoa', '~> 4.2'
 
 end