Merge pull request #23 from CrazyFanFan/swift/5.0

update to swift5 && fix cocoapod can not use RxSwift ~> 5.0
inamiy · Jun 9, 2019 · bc7cf7c · bc7cf7c
2 parents 080055c + b9b06f0
commit bc7cf7c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 13 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2.1
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ env:
     - LC_CTYPE=en_US.UTF-8
     - XCPROJ="-workspace RxAutomaton.xcworkspace -scheme RxAutomaton"
 
-osx_image: xcode10.1
+osx_image: xcode10.2
 
 matrix:
   include:

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" ~> 5.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v7.3.4"
-github "Quick/Quick" "v1.3.4"
-github "ReactiveX/RxSwift" "4.4.1"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.1.0"
+github "ReactiveX/RxSwift" "5.0.1"
 github "mrackwitz/xcconfigs" "3.0"
 github "shu223/Pulsator" "0.4.2"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import Foundation
 import PackageDescription

diff --git a/RxAutomaton.podspec b/RxAutomaton.podspec
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/inamiy/RxAutomaton.git", :tag => "#{s.version}" }
   s.source_files  = "Sources/**/*.swift"
 
-  s.dependency "RxSwift", "~> 4.0"
+  s.dependency "RxSwift", "~> 5.0"
 end
diff --git a/RxAutomaton.xcodeproj/project.pbxproj b/RxAutomaton.xcodeproj/project.pbxproj
@@ -372,7 +372,7 @@
 				TargetAttributes = {
 					488738DB1D61689000BF70F4 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					488738E51D61689100BF70F4 = {
@@ -381,13 +381,14 @@
 					};
 					48AC07691D61C962000293FD = {
 						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 				};
 			};
 			buildConfigurationList = 488738D61D61689000BF70F4 /* Build configuration list for PBXProject "RxAutomaton" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -631,6 +632,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomaton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -651,6 +653,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomaton;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -689,6 +692,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomatonDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -704,6 +708,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomatonDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};