Merge pull request Moya#1769 from Moya/fix/watchos-deployment

Fix pod install error for RxMoya and ReactiveMoya subspecs due to watchOS version

Changelog.md

@@ -3,9 +3,8 @@
 # [12.0.0] - 2018-11-18
 
 ### Changed
-- **Breaking Change** watchOS deployment target for RxMoya is now 3.0. [#1758](https://github.com/Moya/Moya/pull/1758) by [@simonrice](https://github.com/simonrice).
-- Fix warnings generated by Xcode 10. Updated project to Swift 4.2 
-  [#1740](https://github.com/Moya/Moya/pull/1740) by [@lexorus](https://github.com/lexorus)
+- **Breaking Change** Minimum watchOS deployment target for Moya is now 3.0. [#1758](https://github.com/Moya/Moya/pull/1769) by [@SD10](https://github.com/SD10).
+- Fix warnings generated by Xcode 10. Updated project to Swift 4.2 [#1740](https://github.com/Moya/Moya/pull/1740) by [@lexorus](https://github.com/lexorus)
 
 # [12.0.0-beta.1] - 2018-08-07
 

Moya.podspec

@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
+  s.watchos.deployment_target = '3.0'
   s.source       = { :git => "https://github.com/Moya/Moya.git", :tag => s.version }
   s.default_subspec = "Core"
   s.swift_version = '4.2'
@@ -26,20 +27,17 @@ Pod::Spec.new do |s|
     ss.dependency "Alamofire", "~> 4.1"
     ss.dependency "Result", "~> 4.0"
     ss.framework  = "Foundation"
-    ss.watchos.deployment_target = '2.0'
   end
 
   s.subspec "ReactiveSwift" do |ss|
     ss.source_files = "Sources/ReactiveMoya/"
     ss.dependency "Moya/Core"
     ss.dependency "ReactiveSwift", "~> 4.0"
-    ss.watchos.deployment_target = '2.0'
   end
 
   s.subspec "RxSwift" do |ss|
     ss.source_files = "Sources/RxMoya/"
     ss.dependency "Moya/Core"
     ss.dependency "RxSwift", "~> 4.0"
-    ss.watchos.deployment_target = '3.0'
   end
 end

Moya.xcodeproj/project.pbxproj

@@ -987,7 +987,7 @@
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -1081,7 +1081,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -1395,7 +1395,7 @@
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -1504,7 +1504,7 @@
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -1544,7 +1544,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -1594,7 +1594,7 @@
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};