Merge pull request #10 from nazeehshoura/development

Release 0.3.0
RxSwiftCommunity · Jun 6, 2017 · c9fb465 · c9fb465
2 parents 0590015 + 42af287
commit c9fb465
Show file tree

Hide file tree

Showing 17 changed files with 245 additions and 563 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [0.3.0](https://github.com/nazeehshoura/RxState/releases/tag/0.3.0)
+
+#### Anomalies
+
+* Replaces `observe(Driver<CurrentStateLastAction>) to observe(StoreType) in `MiddlewareType`.
+
 ## [0.2.1](https://github.com/nazeehshoura/RxState/releases/tag/0.2.1)
 
 #### Anomalies

diff --git a/RxState.podspec b/RxState.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "RxState"
-  s.version      = "0.2.1"
+  s.version      = "0.3.0"
   s.summary      = "RxSwift + Redux"
 
   # This description is used to generate tags and improve search results.

diff --git a/RxState.xcodeproj/project.pbxproj b/RxState.xcodeproj/project.pbxproj
@@ -364,7 +364,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -420,7 +420,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -450,10 +450,10 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 2;
+				DYLIB_CURRENT_VERSION = 3;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = RxState/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -474,10 +474,10 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 2;
+				DYLIB_CURRENT_VERSION = 3;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = RxState/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/RxState/Info.plist b/RxState/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.1</string>
+	<string>0.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>3</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/RxState/RxState.swift b/RxState/RxState.swift
@@ -108,7 +108,7 @@ public class Store: StoreType {
         self.middlewares.append(contentsOf: middlewares)
 
         for middleware in middlewares {
-            middleware.observe(currentStateLastAction: self.currentStateLastAction)
+            middleware.observe(store: self)
         }
     }
 }
@@ -149,7 +149,7 @@ public protocol ActionType {}
  That's how you get predictable state change.
  */
 public protocol MiddlewareType {
-    func observe(currentStateLastAction: Driver<CurrentStateLastAction>)
+    func observe(store: StoreType)
 }
 
 /**

diff --git a/RxStateExample/Podfile b/RxStateExample/Podfile
@@ -5,40 +5,30 @@ def common_pods
     pod 'RxOptional', '3.1.3'
 end
 
+def common_test_pods
+    pod 'RxTest', '3.4.1'
+end
+
 
 target 'RxStateExample-iOS' do
   platform :ios, '9.0'
   use_frameworks!
 
   pod 'RxDataSources', '1.0.3'
   common_pods
-
-  target 'RxStateExample-iOSTests' do
-    inherit! :search_paths
-
-  end
-
-  target 'RxStateExample-iOSUITests' do
-    inherit! :search_paths
-  end
-
 end
 
 target 'RxStateExample-macOS' do
   platform :osx, '10.10'
   use_frameworks!
-
   common_pods
+end
 
-  target 'RxStateExample-macOSTests' do
-    inherit! :search_paths
-
-  end
-
-  target 'RxStateExample-macOSUITests' do
-    inherit! :search_paths
-  end
-
+target 'RxStateExampleTests' do
+    platform :ios, '9.0'
+    use_frameworks!
+    common_pods
+    common_test_pods
 end
 
 

diff --git a/RxStateExample/Podfile.lock b/RxStateExample/Podfile.lock
@@ -7,25 +7,29 @@ PODS:
   - RxOptional (3.1.3):
     - RxCocoa
     - RxSwift
-  - RxState (0.0.2):
-    - RxCocoa
-    - RxSwift
+  - RxState (0.2.1):
+    - RxCocoa (= 3.4.1)
+    - RxSwift (= 3.4.1)
   - RxSwift (3.4.1)
+  - RxTest (3.4.1):
+    - RxSwift (~> 3.4)
 
 DEPENDENCIES:
   - RxCocoa (= 3.4.1)
   - RxDataSources (= 1.0.3)
   - RxOptional (= 3.1.3)
-  - RxState (= 0.0.2)
+  - RxState (= 0.2.1)
   - RxSwift (= 3.4.1)
+  - RxTest (= 3.4.1)
 
 SPEC CHECKSUMS:
   RxCocoa: a8a5f1d061d0043e28f56976829f31ce63e8eb09
   RxDataSources: a021a0e944ba5f7991259829d973afdbfa719c0b
   RxOptional: b97b59183af80d1e729ac9e51d09a10be668d6a8
-  RxState: cf2169c8332f1c5634f89789cab3f0792d7af8eb
+  RxState: 7921a9ffc66735a44969b449c53f0d9e7dca58c0
   RxSwift: 656f8fbeca5bc372121a72d9ebdd3cd3bc0ffade
+  RxTest: a6fd6e4069face7c6488f96f6c42296b3e44db48
 
-PODFILE CHECKSUM: 953069fd97e5fce1d4ad60b5f033c37b1f3b476d
+PODFILE CHECKSUM: cb064c67a118f11a90961c90a62f656941a70bdb
 
 COCOAPODS: 1.2.1