Merge pull request #11 from Swinject/release2.0

Release 2.0

.Package.test.swift

@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+    name: "SwinjectAutoregistration",
+    dependencies: [
+        .Package(url: "https://github.com/Swinject/Swinject.git", majorVersion: 2),
+        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
+        .Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),
+    ]
+)

.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

.swift-version

@@ -0,0 +1 @@
+3.0.1

.travis.yml

@@ -1,14 +1,40 @@
-# references:
-# * http://www.objc.io/issue-6/travis-ci.html
-# * https://github.com/supermarin/xcpretty#usage
-
-osx_image: xcode7.3
 language: objective-c
-# cache: cocoapods
-# podfile: Example/Podfile
-# before_install:
-# - gem install cocoapods # Since Travis is not always on latest version
-# - pod install --project-directory=Example
+osx_image: xcode8.1
+env:
+  global:
+    - LC_CTYPE=en_US.UTF-8
+    - PROJECT=SwinjectAutoregistration.xcodeproj
+git:
+  submodules: false
+matrix:
+  include:
+    - env: JOB="LINUX_SPM"
+      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="POD_LINT"
+      script:
+        - pod repo update
+        - pod lib lint
+    - env: JOB="XCODE" DEST="OS=8.4,name=iPhone 5s" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test"
+    - env: JOB="XCODE" DEST="OS=9.3,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test"
+    - env: JOB="XCODE" DEST="OS=10.1,name=iPhone 7 Plus" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test"
+    - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectAutoregistration-OSX" SDK="macosx" ACTION="test"
+    - env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectAutoregistration-tvOS" SDK="appletvsimulator" ACTION="test"
+    - env: JOB="XCODE" DEST="OS=10.0,name=Apple TV 1080p" SCHEME="SwinjectAutoregistration-tvOS" SDK="appletvsimulator" ACTION="test"
+    - env: JOB="XCODE" DEST="OS=2.2,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS" SDK="watchsimulator" ACTION="build"
+    - env: JOB="XCODE" DEST="OS=3.1,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS" SDK="watchsimulator" ACTION="build"
 script:
-- set -o pipefail && xcodebuild test -workspace Example/ACKSwinject.xcworkspace -scheme ACKSwinject-Example -sdk iphonesimulator9.3 ONLY_ACTIVE_ARCH=NO | xcpretty
-- pod lib lint
+  - set -o pipefail
+  - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
+  - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty
+notifications:
+  email:
+    on_success: never

Cartfile

@@ -1 +1 @@
-github "Swinject/Swinject" "2.0.0-beta.2"
+github "Swinject/Swinject" "2.0.0"

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v5.0.0"
+github "Quick/Nimble" "v5.1.0"
 github "Quick/Quick" "v0.10.0"
-github "Swinject/Swinject" "2.0.0-beta.2"
+github "Swinject/Swinject" "2.0.0"
 github "jspahrsummers/xcconfigs" "0.10"

Carthage/Checkouts/Nimble/.gitignore

@@ -1,5 +1,7 @@
 .DS_Store
-xcuserdata/
+**/xcuserdata/*
+**/*.xccheckout
+**/*.xcscmblueprint
 build/
 .idea
 DerivedData/

Carthage/Checkouts/Nimble/.travis.yml

@@ -2,9 +2,9 @@ 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_RUNTIME_IOS_SDK_VERSION=10.0
     - os: osx

Carthage/Checkouts/Nimble/CONTRIBUTING.md

@@ -46,6 +46,14 @@ Be sure to include in your issue:
 
 - Use `Nimble.xcodeproj` to work on Nimble.
 
+## Running the Swift Package Manager tests
+
+1. Install `swiftenv` by running a line from the build script (`.travis.yml`):
+
+    eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+
+2. Run `./test swiftpm`
+
 ## Pull Requests
 
 - Nothing is trivial. Submit pull requests for anything: typos,

Carthage/Checkouts/Nimble/Gemfile

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

Carthage/Checkouts/Nimble/Gemfile.lock

@@ -1,67 +1,69 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (1.0.0)
-    cocoapods (1.0.1)
-      activesupport (>= 4.0.2)
-      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)
+    claide (1.0.1)
+    cocoapods (1.1.0.rc.3)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.1.0.rc.3)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.1, < 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)
+      cocoapods-trunk (= 1.1.0.beta.1)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 2.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (>= 1.1.0, < 2.0)
-    cocoapods-core (1.0.1)
-      activesupport (>= 4.0.2)
+      xcodeproj (>= 1.3.2, < 2.0)
+    cocoapods-core (1.1.0.rc.3)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.0)
-    cocoapods-downloader (1.0.1)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.0.0)
+    cocoapods-trunk (1.1.0.beta.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (1.0.0)
+    cocoapods-try (1.1.0)
     colored (1.2)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.9.0)
-    molinillo (0.4.5)
+    minitest (5.9.1)
+    molinillo (0.5.1)
     nap (1.1.0)
     netrc (0.7.8)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (1.1.0)
+    xcodeproj (1.3.2)
       activesupport (>= 3)
-      claide (>= 1.0.0, < 2.0)
+      claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.1.0.rc.3)
 
 BUNDLED WITH
-   1.12.3
+   1.13.1

Carthage/Checkouts/Nimble/Nimble.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Nimble"
-  s.version      = "5.0.0"
+  s.version      = "5.1.1"
   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.
@@ -11,12 +11,37 @@ Pod::Spec.new do |s|
   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       = { :git => "https://github.com/Quick/Nimble.git",
+                     :tag => "v#{s.version}" }
+
+  s.source_files = "Sources/**/*.{swift,h,m,c}"
+
+  s.osx.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
+  ]
+  s.ios.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
+  ]
+  s.tvos.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.{h,c}",
+    "Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.m",
+  ]
 
-  s.source_files = "Sources/**/**/*.{swift,h,m}"
   s.private_header_files = "Sources/NimbleObjectiveC/CurrentTestCaseTracker.h"
+  s.tvos.private_header_files = "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.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"' }
+  s.compiler_flags = '-DPRODUCT_NAME=Nimble/Nimble'
+  s.pod_target_xcconfig = {
+    'ENABLE_BITCODE' => 'NO',
+    'OTHER_LDFLAGS' => '-weak-lswiftXCTest',
+    'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"',
+  }
 end