Merge pull request #31 from huri000/feature/swift-5

🍎 Update to Swift 5
huri000 · Mar 28, 2019 · 0e5f7da · 0e5f7da
2 parents 7d920a4 d50f64d
commit 0e5f7da
Show file tree

Hide file tree

Showing 125 changed files with 3,159 additions and 3,805 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5  1,5 @@
 language: objective-c
-osx_image: xcode10
 osx_image: xcode10.2
 cache: cocoapods
 podfile: Example/Podfile
 
@@ -11,7  11,7 @@ env:
 # travis cache isn't kept between builds
 before_install:
   - rvm use system
-  - sudo gem install cocoapods -v '1.5.3'  
   - sudo gem install cocoapods -v '1.6.1'  
   - pod repo update
 
 script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6  1,10 @@
 # Change Log
 Any notable changes to this project will be documented in this file.
 
 ## 3.0.0
 
 Update to Swift 5. 
 
 ## 2.1.0
 
 Updated project swift version to 4.2 as well as run target.

diff --git a/Example/Podfile b/Example/Podfile
@@ -3,8  3,8 @@ use_frameworks!
 pod 'QuickLayout', :path => '../'
 
 def testing_pods
-    pod 'Quick', '1.3.2'
-    pod 'Nimble', '7.3.1'
     pod 'Quick', '2.0.0'
     pod 'Nimble', '8.0.1'
 end
 
 target 'QuickLayoutiOSDemo' do

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,11  1,11 @@
 PODS:
-  - Nimble (7.3.1)
-  - Quick (1.3.2)
-  - QuickLayout (2.1.1)
   - Nimble (8.0.1)
   - Quick (2.0.0)
   - QuickLayout (3.0.0)
 
 DEPENDENCIES:
-  - Nimble (= 7.3.1)
-  - Quick (= 1.3.2)
   - Nimble (= 8.0.1)
   - Quick (= 2.0.0)
   - QuickLayout (from `../`)
 
 SPEC REPOS:
@@ -18,10  18,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
-  Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
-  QuickLayout: 9d1e7ce7dcb7a489860b6609ebdce3549c041b3a
   Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
   Quick: ce1276c7c27ba2da3cb2fd0cde053c3648b3b22d
   QuickLayout: 07b45a72b10083fee3f095990cfed1c1e7b27f0a
 
-PODFILE CHECKSUM: d720bdfc32ce7952cb312b2e34d54002821cd3be
 PODFILE CHECKSUM: a75bd3f69f45e4cf9ed6700dc2ff0b8a0a868024
 
-COCOAPODS: 1.5.3
 COCOAPODS: 1.7.0.beta.3
diff --git a/Example/Pods/Local Podspecs/QuickLayout.podspec.json b/Example/Pods/Local Podspecs/QuickLayout.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Nimble/README.md b/Example/Pods/Nimble/README.md
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/AdapterProtocols.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NMBObjCMatcher.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift b/Example/Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift