Merge pull request #200 from qutheory/hd/04-25

Updated to Swift 3.0 Snapshot 04-25

.swift-version

@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-04-12-a
+DEVELOPMENT-SNAPSHOT-2016-04-25-a

Package.swift

@@ -16,8 +16,8 @@ let package = Package(
         .Package(url: "https://github.com/ketzusaka/Hummingbird.git", majorVersion: 1, minor: 4),
 
         //SHA2 + HMAC hashing. Used by the core to create session identifiers.
-        .Package(url: "https://github.com/CryptoKitten/HMAC.git", majorVersion: 0, minor: 4),
-        .Package(url: "https://github.com/CryptoKitten/SHA2.git", majorVersion: 0, minor: 3)
+        .Package(url: "https://github.com/CryptoKitten/HMAC.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/CryptoKitten/SHA2.git", majorVersion: 0, minor: 5)
     ],
     exclude: [
         "XcodeProject"

Sources/Vapor/Log/Log.swift

@@ -42,7 +42,7 @@ public class Log {
         Enabled log levels. Default is to log all levels. This
         can be overridden.
      */
-    public static var enabledLevels: [Log.Level] = Log.Level.all
+    public static var enabledLevels: [Level] = Log.Level.all
 
     /**
         Logs verbose messages if .Verbose is enabled

Sources/Vapor/Routing/Application+Route.swift

@@ -243,7 +243,7 @@ extension Application {
         Create multiple routes with the same base URL
         without repeating yourself.
     */
-    public func group(_ prefix: String, @noescape handler: () -> Void) {
+    public func group(_ prefix: String, handler: @noescape () -> Void) {
         let original = scopedPrefix
 
         //append original with a trailing slash

Sources/Vapor/Utilities/Lock.swift

@@ -30,7 +30,7 @@ class Lock {
         pthread_mutex_unlock(mutex)
     }
 
-    func locked(@noescape closure: () throws -> Void) rethrows {
+    func locked(closure: @noescape () throws -> Void) rethrows {
         lock()
         defer { unlock() }
         try closure()