Cleanup for 8.0.0-beta.1 release.

lixin1988 · Sep 19, 2016 · ee47e47 · ee47e47
1 parent ac78832
commit ee47e47
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 35 deletions.
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -727,7 +727,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AA7BEF2AA2DEF9FE9133A0A /* Pods-MoyaTests-tvOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -744,7 +743,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B884EC902CBA233B25EE6357 /* Pods-MoyaTests-tvOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -762,7 +760,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7C709DF02DA056BF033C0298 /* Pods-MoyaTests-Mac.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -780,7 +777,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = AC6FB71F11D38C06B1A7AEFF /* Pods-MoyaTests-Mac.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -888,7 +884,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = AF335F4FBC9B94C359011B46 /* Pods-Demo.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -903,7 +898,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4BF06D5D3DD24C44F9301FB5 /* Pods-Demo.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -918,7 +912,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 0480606784859ACFF9BF6C78 /* Pods-MoyaTests-iOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -936,7 +929,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FFA24DA9F9F1357E6C6CDC10 /* Pods-MoyaTests-iOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

diff --git a/Demo/Podfile b/Demo/Podfile
@@ -8,9 +8,8 @@ def libraries
   pod 'Moya/ReactiveCocoa', :path => "../"
   pod 'Moya/RxSwift', :path => "../"
   pod 'Alamofire', "~> 4.0.0"
-  pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift', :branch => 'master'
-  pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift', :branch => 'master'
-  pod 'Result', :git => 'https://github.com/antitypical/Result', :branch => 'master'
+  pod 'RxSwift', '3.0.0-beta.1'
+  pod 'RxCocoa', '3.0.0-beta.1'
   pod 'ReactiveSwift', :podspec => 'https://raw.githubusercontent.com/ashfurrow/ReactiveSwift/ea5a7f9c7e31adf262be14173a80709c15d25300/ReactiveSwift.podspec'
 end
 

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -42,9 +42,8 @@ DEPENDENCIES:
   - OHHTTPStubs
   - Quick (from `https://github.com/Quick/Quick`, branch `swift-3.0`)
   - ReactiveSwift (from `https://raw.githubusercontent.com/ashfurrow/ReactiveSwift/ea5a7f9c7e31adf262be14173a80709c15d25300/ReactiveSwift.podspec`)
-  - Result (from `https://github.com/antitypical/Result`, branch `master`)
-  - RxCocoa (from `https://github.com/ReactiveX/RxSwift`, branch `master`)
-  - RxSwift (from `https://github.com/ReactiveX/RxSwift`, branch `master`)
+  - RxCocoa (= 3.0.0-beta.1)
+  - RxSwift (= 3.0.0-beta.1)
 
 EXTERNAL SOURCES:
   Moya:
@@ -57,15 +56,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/Quick/Quick
   ReactiveSwift:
     :podspec: https://raw.githubusercontent.com/ashfurrow/ReactiveSwift/ea5a7f9c7e31adf262be14173a80709c15d25300/ReactiveSwift.podspec
-  Result:
-    :branch: master
-    :git: https://github.com/antitypical/Result
-  RxCocoa:
-    :branch: master
-    :git: https://github.com/ReactiveX/RxSwift
-  RxSwift:
-    :branch: master
-    :git: https://github.com/ReactiveX/RxSwift
 
 CHECKOUT OPTIONS:
   Nimble:
@@ -77,15 +67,6 @@ CHECKOUT OPTIONS:
   ReactiveSwift:
     :commit: d2794c7a0b34c375cd4532e10238205afe09de9a
     :git: https://github.com/ReactiveCocoa/ReactiveSwift.git
-  Result:
-    :commit: 36393ea4ebeb56bdb2e6c6502d79905f255391a4
-    :git: https://github.com/antitypical/Result
-  RxCocoa:
-    :commit: 06129b50cf17bc24bd0bef9e60982eac35f7d1c1
-    :git: https://github.com/ReactiveX/RxSwift
-  RxSwift:
-    :commit: 06129b50cf17bc24bd0bef9e60982eac35f7d1c1
-    :git: https://github.com/ReactiveX/RxSwift
 
 SPEC CHECKSUMS:
   Alamofire: fef59f00388f267e52d9b432aa5d93dc97190f14
@@ -98,6 +79,6 @@ SPEC CHECKSUMS:
   RxCocoa: 8cecf331302b8ae5381bbab1bccba4ede2eae6a8
   RxSwift: 0823e8d7969c23bfa9ddfb2afa4881e424a1a710
 
-PODFILE CHECKSUM: 6f11a8d6318c28864f290f562faedca412c409d2
+PODFILE CHECKSUM: 31bd6956c39b5a6b002a2d365c22e5632cce0742
 
 COCOAPODS: 1.1.0.rc.2
diff --git a/Rakefile b/Rakefile
@@ -118,6 +118,7 @@ end
 desc 'Release a version, specified as an argument.'
 task :release, :version do |task, args|
   version = args[:version]
+  # Needs a X.Y.Z-text format.
   abort "You must specify a version in semver format." if version.nil? || version.scan(/\d+\.\d+\.\d+/).length == 0
 
   puts "Updating podspec."

diff --git a/Readme.md b/Readme.md
@@ -50,17 +50,29 @@ Installation
 ------------
 
 ### CocoaPods
-Just add `pod 'Moya'` to your Podfile and go!
+
+For Moya, us the following entry in your Podfile:
+
+```rb
+pod 'Moya', '8.0.0-beta.1'
+```
 
 In any file you'd like to use Moya in, don't forget to
 import the framework with `import Moya`.
 
 For RxSwift or ReactiveCocoa extensions, this project will include
-them as dependencies. You can do this via CocoaPods subspecs.
+them as dependencies. You can do this via CocoaPods subspecs, but you will also
+need to include the pre-release versions of RxSwift or ReactiveSwift manually.
 
 ```rb
 pod 'Moya/RxSwift'
+pod 'RxSwift', '3.0.0-beta.1'
+pod 'RxCocoa', '3.0.0-beta.1'
+
+# or
+
 pod 'Moya/ReactiveCocoa'
+pod 'ReactiveSwift', :podspec => 'https://raw.githubusercontent.com/ashfurrow/ReactiveSwift/ea5a7f9c7e31adf262be14173a80709c15d25300/ReactiveSwift.podspec'
 ```
 
 Then run `pod install`.

diff --git a/circle.yml b/circle.yml
@@ -6,6 +6,7 @@ machine:
 
 dependencies:
   override:
+    - brew update ; brew update # Due to a problem with Homebrew, see: https://github.com/Homebrew/brew/issues/991
     - brew install swiftlint
     - bundle install
     - cd Demo ; bundle exec pod install