Update Quick & Nimble

applidium · Mar 27, 2019 · 97f4558 · 97f4558
1 parent c96935d
commit 97f4558
Show file tree

Hide file tree

Showing 245 changed files with 2,972 additions and 2,608 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "Quick/Nimble" ~> 7.3
-github "Quick/Quick" ~> 1.3
+github "Quick/Nimble" ~> 8.0
+github "Quick/Quick" ~> 2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v7.3.4"
-github "Quick/Quick" "v1.3.4"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.0.0"
diff --git a/Carthage/Checkouts/Nimble/.swift-version b/Carthage/Checkouts/Nimble/.swift-version
@@ -1 +1 @@
-3.0
+4.2
diff --git a/Carthage/Checkouts/Nimble/.swiftlint.yml b/Carthage/Checkouts/Nimble/.swiftlint.yml
@@ -1,19 +1,31 @@
 disabled_rules:
-  - todo
-  - variable_name
-  - force_try
-  - force_cast
+  - 
 
 included:
   - Sources
   - Tests
 
 excluded:
   - Carthage/Checkouts
+  - Tests/NimbleTests/XCTestManifests.swift
+  - Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
 
 trailing_comma:
   mandatory_comma: true
 
 line_length:
   ignores_comments: true
   ignores_function_declarations: true
+
+identifier_name:
+  max_length: 50
+  excluded:
+    - x
+    - l
+    - r
+    - e
+    - n1
+    - n2
+    - to
+  allowed_symbols:
+      - _
diff --git a/Carthage/Checkouts/Nimble/.travis.yml b/Carthage/Checkouts/Nimble/.travis.yml
@@ -1,72 +1,52 @@
-osx_image: xcode8.3
+osx_image: xcode10.1
 language: generic
 matrix:
   include:
     - os: osx
       sudo: required
       env: TYPE=podspec
+      install: bundle install
+      name: CocoaPods Lint
     - os: osx
-      env: TYPE=ios NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0
+      env: TYPE=ios
+      name: iOS / Swift 4.2.1
     - os: osx
-      env: TYPE=tvos NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0
+      env: TYPE=tvos
+      name: tvOS / Swift 4.2.1
     - os: osx
       env: TYPE=macos
+      name: macOS / Swift 4.2.1
     - os: osx
       env: TYPE=macos
-      osx_image: xcode9.2
+      osx_image: xcode10.2
+      name: macOS / Swift 5.0
     - os: osx
-      env: TYPE=macos
-      osx_image: xcode9.4
-    - os: osx
-      env: TYPE=macos
-      osx_image: xcode10.1
-    - os: osx
-      env: TYPE=swiftpm
-    - os: osx
-      env: TYPE=swiftpm
-      osx_image: xcode9.2
+      env:
+        - TYPE=swiftpm
     - os: osx
-      env: TYPE=swiftpm
-      osx_image: xcode10.1
-    - os: linux
-      dist: trusty
-      sudo: required
-      env: TYPE=swiftpm
-      install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    - os: linux
-      dist: trusty
-      sudo: required
       env:
         - TYPE=swiftpm
-        - SWIFT_VERSION=4.0.3
-      install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    - os: linux
+      osx_image: xcode10.2
+    - &linux
+      name: Linux / Swift 4.2.1
+      os: linux
       dist: trusty
       sudo: required
       env:
         - TYPE=swiftpm
-        - SWIFT_VERSION=4.1.3
+        - SWIFT_VERSION=4.2.1
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    - os: linux
-      dist: trusty
-      sudo: required
+    - <<: *linux
+      name: Linux / Swift 5.0 Development
       env:
         - TYPE=swiftpm
-        - SWIFT_VERSION=4.2.1
+        - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-#     - os: linux
-#       dist: trusty
-#       sudo: required
-#       env:
-#         - TYPE=swiftpm
-#         - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-01-13-a
-#       install:
-#         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-install:
-  - if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
+install: true
 script:
   - ./test $TYPE
+
+notifications:
+  email: false
diff --git a/Carthage/Checkouts/Nimble/Gemfile b/Carthage/Checkouts/Nimble/Gemfile
@@ -1,4 +1,4 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'cocoapods', '1.5.0'
+gem 'cocoapods', '~> 1.6.0.rc.2'
diff --git a/Carthage/Checkouts/Nimble/Gemfile.lock b/Carthage/Checkouts/Nimble/Gemfile.lock
@@ -2,75 +2,75 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    atomos (0.1.2)
+    atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.5.0)
+    cocoapods (1.6.0.rc.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.0)
+      cocoapods-core (= 1.6.0.rc.2)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 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.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.0)
+      ruby-macho (~> 1.3, >= 1.3.1)
+      xcodeproj (>= 1.8.0, < 2.0)
+    cocoapods-core (1.6.0.rc.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
-    molinillo (0.6.5)
-    nanaimo (0.2.5)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    ruby-macho (1.1.0)
+    ruby-macho (1.3.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.7)
+    xcodeproj (1.8.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
+      nanaimo (~> 0.2.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.5.0)
+  cocoapods (~> 1.6.0.rc.2)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/Carthage/Checkouts/Nimble/Nimble.podspec b/Carthage/Checkouts/Nimble/Nimble.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Nimble"
-  s.version      = "7.3.4"
+  s.version      = "8.0.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.
@@ -49,4 +49,7 @@ Pod::Spec.new do |s|
     'OTHER_SWIFT_FLAGS' => '$(inherited) -suppress-warnings',
     'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"',
   }
+
+  s.cocoapods_version = '>= 1.4.0'
+  s.swift_version = '4.2'
 end