codablekit updates

vapor · Mar 27, 2018 · b979339 · b979339
1 parent 6f577ef
commit b979339
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,7 +18,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/mysql.git", from: "3.0.0-rc.2"),
     ],
     targets: [
-        .target(name: "FluentMySQL", dependencies: ["Async", "CodableKit", "Fluent", "FluentSQL", "MySQL"]),
+        .target(name: "FluentMySQL", dependencies: ["Async", "Fluent", "FluentSQL", "MySQL"]),
         .testTarget(name: "FluentMySQLTests", dependencies: ["FluentBenchmark", "FluentMySQL"]),
     ]
 )
diff --git a/Sources/FluentMySQL/MySQLModel.swift b/Sources/FluentMySQL/MySQLModel.swift
@@ -8,9 +8,6 @@ public protocol MySQLModel: Model where Self.Database == MySQLDatabase, Self.ID
 }
 
 extension MySQLModel {
-    /// See `Model.ID`
-    public typealias ID = Int
-
     /// See `Model.idKey`
     public static var idKey: IDKey { return \.id }
 }
@@ -27,9 +24,6 @@ public protocol MySQLUUIDModel: Model where Self.Database == MySQLDatabase, Self
 }
 
 extension MySQLUUIDModel {
-    /// See `Model.ID`
-    public typealias ID = UUID
-
     /// See `Model.idKey`
     public static var idKey: IDKey { return \.id }
 }

diff --git a/Tests/FluentMySQLTests/FluentMySQLTests.swift b/Tests/FluentMySQLTests/FluentMySQLTests.swift
@@ -4,6 +4,8 @@ import FluentBenchmark
 import Dispatch
 import FluentMySQL
 import COperatingSystem
+import Service
+import Console
 
 class FluentMySQLTests: XCTestCase {
     var benchmarker: Benchmarker<MySQLDatabase>!