Merge pull request #6 from inamiy/ReactiveSwift-1.0.0

inamiy · web-flow · commit aabaf64e7e94 · 2017-01-08T21:40:08.000+09:00
Add CocoaPods &amp; Swift Package Manager support, update ReactiveSwift to 1.0.0
diff --git a/.Package.test.swift b/.Package.test.swift
@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+    name: "ReactiveAutomaton",
+    dependencies: [
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1),
+        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
+        .Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1)
+    ]
+)
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ playground.xcworkspace
 # Swift Package Manager
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
+Packages/
 .build/
 
 # CocoaPods
@@ -54,7 +54,7 @@ Carthage/Build
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,11 @@ env:
     - LC_CTYPE=en_US.UTF-8
     - XCPROJ="-workspace ReactiveAutomaton.xcworkspace -scheme ReactiveAutomaton"
 
+osx_image: xcode8.2
+
 matrix:
   include:
     - os: osx
-      osx_image: xcode8
       language: objective-c
       script:
         - set -o pipefail
@@ -15,16 +16,14 @@ matrix:
         - JOB=xcodebuild-macOS
 
     - os: osx
-      osx_image: xcode8
       language: objective-c
       script:
         - set -o pipefail
-        - xcodebuild build-for-testing test-without-building -destination 'platform=iOS Simulator,name=iPhone 6s' ENABLE_TESTABILITY=YES $XCPROJ | xcpretty
+        - xcodebuild build-for-testing test-without-building -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.0' ENABLE_TESTABILITY=YES $XCPROJ | xcpretty
       env:
         - JOB=xcodebuild-iOS
 
     - os: osx
-      osx_image: xcode8
       language: objective-c
       script:
         - set -o pipefail
@@ -33,16 +32,34 @@ matrix:
         - JOB=xcodebuild-tvOS
 
     - os: osx
-      osx_image: xcode8
       language: objective-c
       script:
         - set -o pipefail
         - xcodebuild build -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm' $XCPROJ | xcpretty
       env:
         - JOB=xcodebuild-watchOS
 
-    # - os: osx
-    #   osx_image: xcode8
-    #   script:
-    #     - pod lib lint --allow-warnings
-    #   env: JOB=pod-lint
+    - os: osx
+      script:
+        - pod repo update --silent
+        - pod lib lint --allow-warnings
+      env: JOB=pod-lint
+
+    - os: osx
+      language: generic
+      script:
+        - swift build
+      env:
+        - JOB=swiftpm-mac
+
+    - os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      before_install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+      script:
+        - mv .Package.test.swift Package.swift
+        - swift build
+        - swift test
+      env: JOB=swiftpm-linux
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveSwift" "master" #~> 1.0.0
+github "ReactiveCocoa/ReactiveSwift" ~> 1.0.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.10.0
+github "Quick/Quick" ~> 1.0.0
 github "Quick/Nimble" ~> 5.0.0
 github "mrackwitz/xcconfigs"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v5.0.0"
-github "Quick/Quick" "v0.10.0"
+github "Quick/Nimble" "v5.1.1"
+github "Quick/Quick" "v1.0.0"
 github "antitypical/Result" "3.1.0"
 github "mrackwitz/xcconfigs" "3.0"
-github "ReactiveCocoa/ReactiveSwift" "90308457b2928c38fd8ab90ab073f217e6560030"
+github "ReactiveCocoa/ReactiveSwift" "1.0.0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 0209419661b6acceff45cd63984596f2e9eea517
+Subproject commit 3720e6b0f6de6d6435f79f8a174fb4bb92df5dc4
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit b441ba9d4abdc87fc153c55de947834b737bbe04
+Subproject commit 9c032315fafca658668d49f6396f1f24b09a83b2
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit 90308457b2928c38fd8ab90ab073f217e6560030
+Subproject commit 7920f196fd5073f4c98e03fa40b4e4b72470b935
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "ReactiveAutomaton",
+    dependencies: [
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1)
+    ]
+)
diff --git a/ReactiveAutomaton.podspec b/ReactiveAutomaton.podspec
@@ -0,0 +1,18 @@
+Pod::Spec.new do |s|
+  s.name         = "ReactiveAutomaton"
+  s.version      = "0.2.0"
+  s.summary      = "ReactiveCocoa + State Machine, inspired by Redux and Elm."
+  s.homepage     = "https://github.com/inamiy/ReactiveAutomaton"
+  s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.author       = { "Yasuhiro Inami" => "inamiy@gmail.com" }
+
+  s.ios.deployment_target = "8.0"
+  s.osx.deployment_target = "10.9"
+  s.watchos.deployment_target = "2.0"
+  s.tvos.deployment_target = "9.0"
+
+  s.source       = { :git => "https://github.com/inamiy/ReactiveAutomaton.git", :tag => "#{s.version}" }
+  s.source_files  = "Sources/**/*.swift"
+
+  s.dependency "ReactiveSwift", "~> 1.0.0"
+end
diff --git a/ReactiveAutomaton.xcodeproj/project.pbxproj b/ReactiveAutomaton.xcodeproj/project.pbxproj
@@ -23,7 +23,7 @@
 		487C0F4B1D0032D80071666D /* NextMappingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487C0F4A1D0032D80071666D /* NextMappingSpec.swift */; };
 		487C0F4D1D003B2E0071666D /* AnyMappingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487C0F4C1D003B2E0071666D /* AnyMappingSpec.swift */; };
 		48B2D1141CED890D0095F175 /* Mapping+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B2D1131CED890D0095F175 /* Mapping+Helper.swift */; };
-		48C03E951D4094270084B208 /* StrategyLatestSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48C03E751D4093610084B208 /* StrategyLatestSpec.swift */; };
+		48C03E951D4094270084B208 /* NextMappingLatestSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48C03E751D4093610084B208 /* NextMappingLatestSpec.swift */; };
 		48F34E801D4072DA00C53CAC /* ReactiveCocoa+FilterMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48F34E7F1D4072DA00C53CAC /* ReactiveCocoa+FilterMap.swift */; };
 /* End PBXBuildFile section */
 
@@ -59,11 +59,12 @@
 		1FAEBD051CDCEFD50046EA72 /* Automaton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Automaton.swift; sourceTree = "<group>"; };
 		1FAEBD071CDCF04E0046EA72 /* Reply.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reply.swift; sourceTree = "<group>"; };
 		1FAEBD091CDCF0990046EA72 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		1FB0B4FA1E2254A900052073 /* LinuxMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinuxMain.swift; sourceTree = "<group>"; };
 		487C0F281D00311E0071666D /* Fixtures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fixtures.swift; sourceTree = "<group>"; };
 		487C0F4A1D0032D80071666D /* NextMappingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextMappingSpec.swift; sourceTree = "<group>"; };
 		487C0F4C1D003B2E0071666D /* AnyMappingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyMappingSpec.swift; sourceTree = "<group>"; };
 		48B2D1131CED890D0095F175 /* Mapping+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Mapping+Helper.swift"; sourceTree = "<group>"; };
-		48C03E751D4093610084B208 /* StrategyLatestSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StrategyLatestSpec.swift; sourceTree = "<group>"; };
+		48C03E751D4093610084B208 /* NextMappingLatestSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextMappingLatestSpec.swift; sourceTree = "<group>"; };
 		48F34E7F1D4072DA00C53CAC /* ReactiveCocoa+FilterMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ReactiveCocoa+FilterMap.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -128,27 +129,27 @@
 			name = "project xcconfigs";
 			sourceTree = "<group>";
 		};
-		1F24EB391CDD197B0008028E /* Tests */ = {
+		1F24EB391CDD197B0008028E /* ReactiveAutomatonTests */ = {
 			isa = PBXGroup;
 			children = (
 				487C0F271D00311E0071666D /* Fixtures */,
 				1F24EB3B1CDD197B0008028E /* MappingSpec.swift */,
 				487C0F4A1D0032D80071666D /* NextMappingSpec.swift */,
 				487C0F4C1D003B2E0071666D /* AnyMappingSpec.swift */,
 				1FA0AC431DE8AAC7007F01E0 /* StateFuncMappingSpec.swift */,
-				48C03E751D4093610084B208 /* StrategyLatestSpec.swift */,
+				48C03E751D4093610084B208 /* NextMappingLatestSpec.swift */,
 				1F242AFE1D08766900647917 /* TerminatingSpec.swift */,
 				1F24EB3A1CDD197B0008028E /* Info.plist */,
 			);
-			path = Tests;
+			path = ReactiveAutomatonTests;
 			sourceTree = "<group>";
 		};
 		1FAEBCEB1CDCEF510046EA72 = {
 			isa = PBXGroup;
 			children = (
 				1F24E04D1CDD15980008028E /* Configurations */,
 				1FAEBD001CDCEF940046EA72 /* Sources */,
-				1F24EB391CDD197B0008028E /* Tests */,
+				1FB0B4F91E2254A900052073 /* Tests */,
 				1FAEBD0D1CDCF0A70046EA72 /* Frameworks */,
 				1FAEBCF61CDCEF510046EA72 /* Products */,
 			);
@@ -188,6 +189,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		1FB0B4F91E2254A900052073 /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				1FB0B4FA1E2254A900052073 /* LinuxMain.swift */,
+				1F24EB391CDD197B0008028E /* ReactiveAutomatonTests */,
+			);
+			path = Tests;
+			sourceTree = "<group>";
+		};
 		487C0F271D00311E0071666D /* Fixtures */ = {
 			isa = PBXGroup;
 			children = (
@@ -330,7 +340,7 @@
 				1FA0AC441DE8AAC7007F01E0 /* StateFuncMappingSpec.swift in Sources */,
 				487C0F4D1D003B2E0071666D /* AnyMappingSpec.swift in Sources */,
 				487C0F291D00311E0071666D /* Fixtures.swift in Sources */,
-				48C03E951D4094270084B208 /* StrategyLatestSpec.swift in Sources */,
+				48C03E951D4094270084B208 /* NextMappingLatestSpec.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -362,7 +372,7 @@
 			baseConfigurationReference = 1F24E5731CDD15AF0008028E /* UniversalFramework_Test.xcconfig */;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Tests/Info.plist;
+				INFOPLIST_FILE = Tests/ReactiveAutomatonTests/Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.ReactiveAutomatonTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -376,7 +386,7 @@
 			baseConfigurationReference = 1F24E5731CDD15AF0008028E /* UniversalFramework_Test.xcconfig */;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = Tests/Info.plist;
+				INFOPLIST_FILE = Tests/ReactiveAutomatonTests/Info.plist;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.ReactiveAutomatonTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Sources/Automaton.swift b/Sources/Automaton.swift
@@ -89,13 +89,13 @@ public final class Automaton<State, Input>
                             .filterMap { input, fromState, nextProducer in
                                 return nextProducer.map { (input, fromState, $0) }
                             }
-                            .flatMap(strategy) { input, fromState, nextProducer -> SignalProducer<Input, NoError> in
+                            .flatMap(strategy) { input, _, nextProducer -> SignalProducer<Input, NoError> in
                                 return recurInputProducer(nextProducer, strategy: strategy)
                                     .prefix(value: input)
                             }
 
                         let failureSignal = mappingSignal
-                            .filterMap { input, fromState, nextProducer -> Input? in
+                            .filterMap { input, _, nextProducer -> Input? in
                                 return nextProducer == nil ? input : nil
                             }
 
@@ -107,7 +107,7 @@ public final class Automaton<State, Input>
             }
         }
 
-        recurInputProducer(SignalProducer(signal: inputSignal), strategy: strategy)
+        recurInputProducer(SignalProducer(inputSignal), strategy: strategy)
             .withLatest(from: stateProperty.producer)
             .flatMap(.merge) { input, fromState -> SignalProducer<Reply<State, Input>, NoError> in
                 if let (toState, _) = mapping(fromState, input) {
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -0,0 +1,13 @@
+import XCTest
+import Quick
+
+@testable import ReactiveAutomatonTests
+
+Quick.QCKMain([
+    MappingSpec.self,
+    NextMappingSpec.self,
+    AnyMappingSpec.self,
+    StateFuncMappingSpec.self,
+    NextMappingLatestSpec.self,
+    TerminatingSpec.self
+])
diff --git a/Tests/ReactiveAutomatonTests/AnyMappingSpec.swift b/Tests/ReactiveAutomatonTests/AnyMappingSpec.swift
diff --git a/Tests/ReactiveAutomatonTests/Fixtures/Fixtures.swift b/Tests/ReactiveAutomatonTests/Fixtures/Fixtures.swift
diff --git a/Tests/ReactiveAutomatonTests/Info.plist b/Tests/ReactiveAutomatonTests/Info.plist
diff --git a/Tests/ReactiveAutomatonTests/MappingSpec.swift b/Tests/ReactiveAutomatonTests/MappingSpec.swift
diff --git a/Tests/ReactiveAutomatonTests/NextMappingLatestSpec.swift b/Tests/ReactiveAutomatonTests/NextMappingLatestSpec.swift
@@ -1,5 +1,5 @@
 //
-//  StrategyLatestSpec.swift
+//  NextMappingLatestSpec.swift
 //  ReactiveAutomaton
 //
 //  Created by Yasuhiro Inami on 2016-07-21.
@@ -45,7 +45,7 @@ class NextMappingLatestSpec: QuickSpec
                     .login    | .loggedOut  => .loggingIn  | loginOKProducer,
                     .loginOK  | .loggingIn  => .loggedIn   | .empty,
                     .logout   | .loggedIn   => .loggingOut | logoutOKProducer,
-                    .logoutOK | .loggingOut => .loggedOut  | .empty,
+                    .logoutOK | .loggingOut => .loggedOut  | .empty
                 ]
 
                 // strategy = `.latest`
diff --git a/Tests/ReactiveAutomatonTests/NextMappingSpec.swift b/Tests/ReactiveAutomatonTests/NextMappingSpec.swift
@@ -45,7 +45,7 @@ class NextMappingSpec: QuickSpec
                     .login    | .loggedOut  => .loggingIn  | loginOKProducer,
                     .loginOK  | .loggingIn  => .loggedIn   | .empty,
                     .logout   | .loggedIn   => .loggingOut | logoutOKProducer,
-                    .logoutOK | .loggingOut => .loggedOut  | .empty,
+                    .logoutOK | .loggingOut => .loggedOut  | .empty
                 ]
 
                 // strategy = `.Merge`
@@ -193,7 +193,7 @@ class NextMappingSpec: QuickSpec
 
                 let mappings: [Automaton.NextMapping] = [
                     .login    | .loggedOut  => .loggingIn  | loginOKProducer,
-                    .loginOK  | .loggingIn  => .loggedIn   | .empty,
+                    .loginOK  | .loggingIn  => .loggedIn   | .empty
                 ]
 
                 // strategy = `.Merge`
diff --git a/Tests/ReactiveAutomatonTests/StateFuncMappingSpec.swift b/Tests/ReactiveAutomatonTests/StateFuncMappingSpec.swift
@@ -28,7 +28,7 @@ class StateFuncMappingSpec: QuickSpec
             beforeEach {
                 let mappings: [Automaton.NextMapping] = [
                     .increment | { $0 + 1 } | .empty,
-                    .decrement | { $0 - 1 } | .empty,
+                    .decrement | { $0 - 1 } | .empty
                 ]
 
                 // strategy = `.merge`
diff --git a/Tests/ReactiveAutomatonTests/TerminatingSpec.swift b/Tests/ReactiveAutomatonTests/TerminatingSpec.swift

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveSwift" "master" #~> 1.0.0`
	`1`	`+github "ReactiveCocoa/ReactiveSwift" ~> 1.0.0`