Merge pull request #84 from mdiep/swift-4

Migrate to Swift 4's Decodable APIs

Author: mdiep

.gitmodules

@@ -1,15 +1,6 @@
 [submodule "Carthage/Checkouts/Result"]
 	path = Carthage/Checkouts/Result
 	url = https://github.com/antitypical/Result.git
-[submodule "Carthage/Checkouts/Argo"]
-	path = Carthage/Checkouts/Argo
-	url = https://github.com/thoughtbot/Argo.git
-[submodule "Carthage/Checkouts/Curry"]
-	path = Carthage/Checkouts/Curry
-	url = https://github.com/thoughtbot/Curry.git
 [submodule "Carthage/Checkouts/ReactiveSwift"]
 	path = Carthage/Checkouts/ReactiveSwift
 	url = https://github.com/ReactiveCocoa/ReactiveSwift.git
-[submodule "Carthage/Checkouts/Runes"]
-	path = Carthage/Checkouts/Runes
-	url = https://github.com/thoughtbot/Runes.git

.swift-version

@@ -1 +1 @@
-3.1
+4.0

.swiftlint.yml

@@ -0,0 +1,4 @@
+included:
+  - Sources
+whitelist_rules:
+  - trailing_closure

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9
 branches:
   only:
     - master
@@ -9,33 +9,13 @@ script: script/cibuild "$TRAVIS_XCODE_WORKSPACE" "$TRAVIS_XCODE_SCHEME" "$XCODE_
 xcode_workspace: Tentacle.xcworkspace
 matrix:
   include:
-    - osx_image: xcode8.3
-      xcode_scheme: Tentacle-OSX
+    - xcode_scheme: Tentacle-OSX
       env: XCODE_ACTION="build-for-testing test-without-building"
-    - osx_image: xcode8.3
-      xcode_scheme: Tentacle-iOS
+    - xcode_scheme: Tentacle-iOS
       env: XCODE_ACTION="build-for-testing test-without-building"
-    - osx_image: xcode8.3
-      xcode_scheme: update-test-fixtures
+    - xcode_scheme: update-test-fixtures
       env: XCODE_ACTION=build
-    - osx_image: xcode8.3
-      before_script: true
-      script:
-        - swift build
-        - swift test
-      env:
-        - JOB=SWIFTPM_DARWIN
-    - osx_image: xcode9
-      xcode_scheme: Tentacle-OSX
-      env: XCODE_ACTION="build-for-testing test-without-building"
-    - osx_image: xcode9
-      xcode_scheme: Tentacle-iOS
-      env: XCODE_ACTION="build-for-testing test-without-building"
-    - osx_image: xcode9
-      xcode_scheme: update-test-fixtures
-      env: XCODE_ACTION=build
-    - osx_image: xcode9
-      before_script: true
+    - before_script: true
       script:
         - swift build
         - swift test

Cartfile

@@ -1,3 +1 @@
 github "ReactiveCocoa/ReactiveSwift" ~> 2.0
-github "thoughtbot/Argo" ~> 4.1.2
-github "thoughtbot/Curry" ~> 3.0

Cartfile.resolved

@@ -1,5 +1,2 @@
-github "ReactiveCocoa/ReactiveSwift" "2.0.0"
+github "ReactiveCocoa/ReactiveSwift" "2.0.1"
 github "antitypical/Result" "3.2.3"
-github "thoughtbot/Argo" "v4.1.2"
-github "thoughtbot/Curry" "v3.0.0"
-github "thoughtbot/Runes" "v4.0.1"