Skip to content

Commit

Permalink
Merge pull request #5 from ReSwift/next-release
Browse files Browse the repository at this point in the history
0.3.0 Release
  • Loading branch information
Ben-G authored Jun 30, 2016
2 parents 554c560 + 59eb733 commit 5d97a88
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReSwift/ReSwift" ~> 1.0.0
github "ReSwift/ReSwift" ~> 2.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReSwift/ReSwift" "1.0.0"
github "ReSwift/ReSwift" "2.0.0"
4 changes: 2 additions & 2 deletions ReSwiftRecorder.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ReSwiftRecorder"
s.version = "0.2.5"
s.version = "0.3.0"
s.summary = "Time Travel and Hot Reloading for ReSwift"
s.description = <<-DESC
A recording store for ReSwift. Enables hot-reloading and time travel for ReSwift apps.
Expand All @@ -14,5 +14,5 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.requires_arc = true
s.source_files = 'ReSwiftRecorder/**/*.swift'
s.dependency 'ReSwift', '~> 1.0.0'
s.dependency 'ReSwift', '~> 2.0'
end
2 changes: 1 addition & 1 deletion ReSwiftRecorder/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.2.5</string>
<string>0.3.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
10 changes: 5 additions & 5 deletions ReSwiftRecorder/RecordingStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public class RecordingMainStore<State: StateType>: Store<State> {
if let standardAction = standardAction {
let recordedAction: [String : AnyObject] = [
"timestamp": NSDate.timeIntervalSinceReferenceDate(),
"action": standardAction.dictionaryRepresentation()
"action": standardAction.dictionaryRepresentation
]

recordedActions.append(recordedAction)
Expand All @@ -139,11 +139,11 @@ public class RecordingMainStore<State: StateType>: Store<State> {
private func decodeAction(jsonDictionary: [String : AnyObject]) -> Action {
let standardAction = StandardAction(dictionary: jsonDictionary)

if !standardAction.isTypedAction {
return standardAction
if !standardAction!.isTypedAction {
return standardAction!
} else {
let typedActionType = self.typeMap[standardAction.type]!
return typedActionType.init(standardAction)
let typedActionType = self.typeMap[standardAction!.type]!
return typedActionType.init(standardAction!)
}
}

Expand Down

0 comments on commit 5d97a88

Please sign in to comment.