Merge pull request #35 from vapor/rc

routing 3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Tanner Nelson
+Copyright (c) 2018 Qutheory, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -1,18 +1,20 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
     name: "Routing",
-    targets: [
-        // Routing
-        Target(name: "Branches"),
-        Target(name: "Routing", dependencies: ["Branches"]),
+    products: [
+        .library(name: "Routing", targets: ["Routing"]),
     ],
     dependencies: [
-        // Core vapor transport layer
-        .Package(url: "https://github.com/vapor/engine.git", majorVersion: 2),
-        .Package(url: "https://github.com/vapor/node.git", majorVersion: 2),
+        // 🌎 Utility package containing tools for byte manipulation, Codable, OS APIs, and debugging.
+        .package(url: "https://github.com/vapor/core.git", from: "3.0.0-rc"),
+
+        // 📦 Dependency injection / inversion of control framework.
+        .package(url: "https://github.com/vapor/service.git", from: "1.0.0-rc"),
     ],
-    exclude: [
-        "Sources/TypeSafeGenerator"
+    targets: [
+        .target(name: "Routing", dependencies: ["Bits", "Debugging", "Service"]),
+        .testTarget(name: "RoutingTests", dependencies: ["Routing"]),
     ]
 )

README.md

@@ -1,9 +1,9 @@
 <p align="center">
-    <img src="https://cloud.githubusercontent.com/assets/1977704/25427184/10acfe5a-2a72-11e7-953f-503d9fb1a115.png" width="320" alt="Routing">
+    <img src="https://user-images.githubusercontent.com/1342803/36578628-7ca4da62-182c-11e8-88de-2949d386bd63.png" height="64" alt="Routing">
     <br>
     <br>
-    <a href="https://docs.vapor.codes/2.0/routing/package/">
-        <img src="http://img.shields.io/badge/read_the-docs-92A8D1.svg" alt="Documentation">
+    <a href="https://docs.vapor.codes/3.0/">
+        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="http://vapor.team">
         <img src="http://vapor.team/badge.svg" alt="Slack Team">
@@ -15,6 +15,6 @@
         <img src="https://circleci.com/gh/vapor/routing.svg?style=shield" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-3.1-brightgreen.svg" alt="Swift 3.1">
+        <img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
     </a>
 </p>