Merge pull request #119 from devxoul/swift-5.0

Let's Swift 5.0 🚀
devxoul · Apr 2, 2019 · 63db5eb · 63db5eb
2 parents ce17f1a + d783083
commit 63db5eb
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 36 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -13,13 +13,11 @@ env:
     - SDK="$TVOS_SDK"     TEST=1  DESTINATION="OS=12.2,name=Apple TV 4K"
 
 install:
-  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
   - swift --version
-  - gem install swiftproj
 
 before_script:
   - set -o pipefail
-  - make project
+  - swift package generate-xcodeproj
 
 script:
   - xcodebuild clean build test

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - URLNavigator (2.1.0)
+  - URLNavigator (2.2.0)
 
 DEPENDENCIES:
   - URLNavigator (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  URLNavigator: e8cea3835b3456d7876eb728831e742273c8d209
+  URLNavigator: 0bffc3efdeb2d97f7b5eec7ac82d290f4a099431
 
 PODFILE CHECKSUM: 797c263b229fb2da6a9381964e439b9c78f774e2
 

diff --git a/Makefile b/Makefile
diff --git a/Package.resolved b/Package.resolved
@@ -3,29 +3,29 @@
     "pins": [
       {
         "package": "Nimble",
-        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "repositoryURL": "https://github.com/devxoul/Nimble.git",
         "state": {
-          "branch": null,
-          "revision": "cd6dfb86f496fcd96ce0bc6da962cd936bf41903",
-          "version": "7.3.1"
+          "branch": "swift-5",
+          "revision": "e904448875265bebc82d6e2a6827bbb68ac9ac23",
+          "version": null
         }
       },
       {
         "package": "Quick",
-        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "repositoryURL": "https://github.com/devxoul/Quick.git",
         "state": {
-          "branch": null,
-          "revision": "5fbf13871d185526993130c3a1fad0b70bfe37ce",
-          "version": "1.3.2"
+          "branch": "swift-5",
+          "revision": "7d18e3f932dbde8c916cf280fe08e81ebbf41297",
+          "version": null
         }
       },
       {
         "package": "Stubber",
         "repositoryURL": "https://github.com/devxoul/Stubber.git",
         "state": {
           "branch": null,
-          "revision": "efb1ed736e889824e74a22e3ac205d4469ad6bad",
-          "version": "1.3.1"
+          "revision": "1c1bbdf1e9e1d04009c6c0bdb030af38b503a612",
+          "version": "1.4.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -4,14 +4,17 @@ import PackageDescription
 
 let package = Package(
   name: "URLNavigator",
+  platforms: [
+    .iOS(.v8), .tvOS(.v9),
+  ],
   products: [
     .library(name: "URLMatcher", targets: ["URLMatcher"]),
     .library(name: "URLNavigator", targets: ["URLNavigator"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "1.2.0")),
-    .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "7.0.2")),
-    .package(url: "https://github.com/devxoul/Stubber.git", .upToNextMajor(from: "1.0.0")),
+    .package(url: "https://github.com/devxoul/Quick.git", .branch("swift-5")),
+    .package(url: "https://github.com/devxoul/Nimble.git", .branch("swift-5")),
+    .package(url: "https://github.com/devxoul/Stubber.git", .upToNextMajor(from: "1.4.0")),
   ],
   targets: [
     .target(name: "URLMatcher"),