[Dependencies] Switch to Latest ReSwift Release

Author: Ben-G

Cartfile

@@ -3,3 +3,5 @@ github "Quick/Quick"
 github "Quick/Nimble"
 github "soffes/SSKeychain"
 github "Ben-G/ListKit"
+github "ReSwift/ReSwift"
+github "ReSwift/ReSwiftRouter"

Cartfile.resolved

@@ -1,6 +1,8 @@
 github "Ben-G/ListKit" "1.0.0"
-github "Quick/Nimble" "v3.1.0"
-github "Quick/Quick" "v0.9.1"
-github "nerdishbynature/RequestKit" "0.2.2"
-github "soffes/SSKeychain" "v1.3.1"
-github "nerdishbynature/octokit.swift" "0.5.2"
+github "Quick/Nimble" "v4.1.0"
+github "Quick/Quick" "v0.9.2"
+github "ReSwift/ReSwift" "2.0.0"
+github "nerdishbynature/RequestKit" "0.3.0"
+github "soffes/SSKeychain" "v1.4.0"
+github "ReSwift/ReSwiftRouter" "0.3.1"
+github "nerdishbynature/octokit.swift" "0.6.1"

Carthage/Checkouts/Nimble/.gitignore

@@ -11,3 +11,9 @@ Nimble.framework.zip
 # Carthage/Checkouts
 
 Carthage/Build
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/

Carthage/Checkouts/Nimble/.ruby-version

@@ -0,0 +1 @@
+system

Carthage/Checkouts/Nimble/.swift-version

@@ -0,0 +1 @@
+DEVELOPMENT-SNAPSHOT-2016-02-25-a

Carthage/Checkouts/Nimble/.travis.yml

@@ -1,9 +1,33 @@
-osx_image: xcode7
-language: objective-c
-
-env:
-  matrix:
-    - NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
-    - NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
-
-script: ./test $TYPE
+osx_image: xcode7.3
+language: generic
+matrix:
+  include:
+    - os: osx
+      sudo: required
+      env: TYPE=podspec
+    - os: osx
+      env: NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
+    - os: osx
+      env: NIMBLE_RUNTIME_TVOS_SDK_VERSION=9.0 TYPE=tvos
+    - os: osx
+      env: NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
+    - os: osx
+      env: TYPE=swiftpm
+    - os: osx
+      env: NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0 TYPE=ios
+      osx_image: xcode8
+    - os: osx
+      env: NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0 TYPE=tvos
+      osx_image: xcode8
+    - os: osx
+      env: NIMBLE_RUNTIME_OSX_SDK_VERSION=10.12 TYPE=osx
+      osx_image: xcode8
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: TYPE=swiftpm
+install:
+  - if [[ "$TYPE" == "swiftpm" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
+  - if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
+script:
+  - ./test $TYPE

Carthage/Checkouts/Nimble/CONTRIBUTING.md

@@ -104,7 +104,9 @@ The process is relatively straight forward, but here's is a useful checklist for
 
 - Look at changes from the previously tagged release and write release notes: `git log v0.4.0...HEAD`
 - Run the release script: `./script/release A.B.C release-notes-file`
-- Go to [github releases](https://github.com/Quick/Nimble/releases) and mark the tagged commit as a release.
-  - Use the same release notes you created for the tag, but tweak up formatting for github.
-  - Attach the carthage release `Nimble.framework.zip` to the release.
+- The script will prompt you to create a new [GitHub release](https://github.com/Quick/Nimble/releases).
+  - Use the same release notes you created for the tag, but tweak up formatting for GitHub.
+- Update [Quick](https://github.com/Quick/Quick)
+  - Update Quick's submodule reference to the newly released Nimble version
+  - Update Nimble version in `README.md` and Documentation in [Quick](https://github.com/Quick/Quick) if it's not a patch version update.
 - Announce!

Carthage/Checkouts/Nimble/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem 'cocoapods'

Carthage/Checkouts/Nimble/Gemfile.lock

@@ -0,0 +1,63 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (0.9.1)
+    cocoapods (0.39.0)
+      activesupport (>= 4.0.2)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.39.0)
+      cocoapods-downloader (~> 0.9.3)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-search (~> 0.1.0)
+      cocoapods-stats (~> 0.6.2)
+      cocoapods-trunk (~> 0.6.4)
+      cocoapods-try (~> 0.5.1)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      molinillo (~> 0.4.0)
+      nap (~> 1.0)
+      xcodeproj (~> 0.28.2)
+    cocoapods-core (0.39.0)
+      activesupport (>= 4.0.2)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-downloader (0.9.3)
+    cocoapods-plugins (0.4.2)
+      nap
+    cocoapods-search (0.1.0)
+    cocoapods-stats (0.6.2)
+    cocoapods-trunk (0.6.4)
+      nap (>= 0.8, < 2.0)
+      netrc (= 0.7.8)
+    cocoapods-try (0.5.1)
+    colored (1.2)
+    escape (0.0.4)
+    fuzzy_match (2.0.4)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.4)
+    molinillo (0.4.4)
+    nap (1.1.0)
+    netrc (0.7.8)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.28.2)
+      activesupport (>= 3)
+      claide (~> 0.9.1)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods
+
+BUNDLED WITH
+   1.11.2

Carthage/Checkouts/Nimble/Nimble.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Nimble"
-  s.version      = "3.1.0"
+  s.version      = "4.1.0"
   s.summary      = "A Matcher Framework for Swift and Objective-C"
   s.description  = <<-DESC
                    Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.
@@ -13,7 +13,9 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = "9.0"
   s.source       = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }
 
-  s.source_files = "Nimble", "Nimble/**/*.{swift,h,m}"
+  s.source_files = "Sources/Nimble/**/*.{swift,h,m}"
+  s.private_header_files = "Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.h"
+  s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
   s.weak_framework = "XCTest"
   s.requires_arc = true
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'OTHER_LDFLAGS' => '-weak-lswiftXCTest', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }