Merge pull request #38 from nodes-vapor/feature/vapor-2-released

Feature/vapor 2 released
ml-archive · May 18, 2017 · 98107ea · 98107ea
2 parents c7c5d2f + 4abb9b6
commit 98107ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+Package.pins
diff --git a/Package.swift b/Package.swift
@@ -3,9 +3,9 @@ import PackageDescription
 let package = Package(
     name: "Storage",
     dependencies: [
-        .Package(url: "https://github.com/vapor/vapor.git", Version(2,0,0, prereleaseIdentifiers: ["beta"])),
-        .Package(url: "https://github.com/nodes-vapor/data-uri.git", Version(1,0,0, prereleaseIdentifiers: ["beta"])),
-        .Package(url: "https://github.com/nodes-vapor/aws.git", Version(1,0,0, prereleaseIdentifiers: ["beta"])),
+        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
+        .Package(url: "https://github.com/nodes-vapor/data-uri.git", majorVersion: 1),
+        .Package(url: "https://github.com/nodes-vapor/aws.git", majorVersion: 1),
         .Package(url: "https://github.com/manGoweb/MimeLib.git", majorVersion: 1)
     ]
 )
diff --git a/Sources/Storage/Storage.swift b/Sources/Storage/Storage.swift
@@ -136,7 +136,7 @@ public class Storage {
         folder: String? = nil
     ) throws -> String {
         return try upload(
-            bytes: base64.base64Decoded,
+            bytes: base64.makeBytes().base64Decoded,
             fileName: fileName,
             fileExtension: fileExtension,
             mime: mime,