Merge pull request #277 from norio-nomura/nn-swift-3-compatibility

[WIP] Swift 3.0 Compatibility

Author: ikesyo

.swift-version

@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-02-25-a
+3.0-PREVIEW-6

.travis.yml

@@ -1,33 +1,25 @@
-osx_image: xcode7.3
+osx_image: xcode8
 language: generic
 matrix:
   include:
+    # - os: osx
+    #   sudo: required
+    #   env: TYPE=podspec
     - os: osx
-      sudo: required
-      env: TYPE=podspec
-    - os: osx
-      env: TYPE=ios NIMBLE_XCODE_ACTION="build test" NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0
+      env: TYPE=ios NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0
     - os: osx
-      env: TYPE=tvos NIMBLE_XCODE_ACTION="build test" NIMBLE_RUNTIME_TVOS_SDK_VERSION=9.0
+      env: TYPE=tvos NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0
     - os: osx
-      env: TYPE=macos NIMBLE_XCODE_ACTION="build test"
+      env: TYPE=macos
     - os: osx
       env: TYPE=swiftpm
-    - os: osx
-      env: TYPE=ios NIMBLE_XCODE_ACTION="build-for-testing test-without-building" NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0
-      osx_image: xcode8
-    - os: osx
-      env: TYPE=tvos NIMBLE_XCODE_ACTION="build-for-testing test-without-building" NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0
-      osx_image: xcode8
-    - os: osx
-      env: TYPE=macos NIMBLE_XCODE_ACTION="build-for-testing test-without-building"
-      osx_image: xcode8
     - os: linux
       dist: trusty
       sudo: required
       env: TYPE=swiftpm
+      install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 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

Gemfile.lock

@@ -7,50 +7,54 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.9.1)
-    cocoapods (0.39.0)
+    claide (1.0.0)
+    cocoapods (1.0.1)
       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)
+      claide (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.0.1)
+      cocoapods-deintegrate (>= 1.0.0, < 2.0)
+      cocoapods-downloader (>= 1.0.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.0.0, < 2.0)
+      cocoapods-try (>= 1.0.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.4.0)
+      fourflusher (~> 0.3.0)
+      molinillo (~> 0.4.5)
       nap (~> 1.0)
-      xcodeproj (~> 0.28.2)
-    cocoapods-core (0.39.0)
+      xcodeproj (>= 1.1.0, < 2.0)
+    cocoapods-core (1.0.1)
       activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-plugins (0.4.2)
+    cocoapods-deintegrate (1.0.0)
+    cocoapods-downloader (1.0.1)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (0.1.0)
-    cocoapods-stats (0.6.2)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.0.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.5.1)
+    cocoapods-try (1.0.0)
     colored (1.2)
     escape (0.0.4)
+    fourflusher (0.3.2)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.4)
-    molinillo (0.4.4)
+    minitest (5.9.0)
+    molinillo (0.4.5)
     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)
+    xcodeproj (1.1.0)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
 
 PLATFORMS
@@ -60,4 +64,4 @@ DEPENDENCIES
   cocoapods
 
 BUNDLED WITH
-   1.11.2
+   1.12.3

Nimble.podspec

@@ -1,20 +1,20 @@
 Pod::Spec.new do |s|
   s.name         = "Nimble"
-  s.version      = "4.1.0"
+  s.version      = "5.0.0-alpha.30p1"
   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.
                    DESC
   s.homepage     = "https://github.com/Quick/Nimble"
   s.license      = { :type => "Apache 2.0", :file => "LICENSE.md" }
   s.author       = "Quick Contributors"
-  s.ios.deployment_target = "7.0"
-  s.osx.deployment_target = "10.9"
+  s.ios.deployment_target = "8.0"
+  s.osx.deployment_target = "10.10"
   s.tvos.deployment_target = "9.0"
   s.source       = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }
 
-  s.source_files = "Sources/Nimble/**/*.{swift,h,m}"
-  s.private_header_files = "Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.h"
+  s.source_files = "Sources/**/**/*.{swift,h,m}"
+  s.private_header_files = "Sources/NimbleObjectiveC/CurrentTestCaseTracker.h"
   s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
   s.weak_framework = "XCTest"
   s.requires_arc = true