Skip to content

Commit

Permalink
Merge pull request #21 from BrettRToomey/json
Browse files Browse the repository at this point in the history
Disabled JSON
  • Loading branch information
BrettRToomey committed Dec 2, 2016
2 parents 4f11f44 + 5b15af7 commit 9390d53
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PackageDescription
let package = Package(
name: "Jobs",
dependencies: [
.Package(url: "https://github.com/vapor/core.git", majorVersion: 1),
.Package(url: "https://github.com/vdka/JSON", majorVersion: 0, minor: 16)
.Package(url: "https://github.com/vapor/core.git", majorVersion: 1)
//.Package(url: "https://github.com/vdka/JSON", majorVersion: 0, minor: 16)
]
)
4 changes: 2 additions & 2 deletions Sources/Helpers.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import JSON
/*import JSON
import Foundation
//TODO(Brett): change implementation to C since foundation is broken on Linux
Expand All @@ -9,4 +9,4 @@ func parseJSONFile(path: String) throws -> JSON {
options: [.allowComments, .omitNulls]
)
return json
}
}*/
4 changes: 2 additions & 2 deletions Sources/JSON.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import JSON
/*import JSON
extension JSON {
func buildJob() throws -> Job? {
Expand All @@ -10,4 +10,4 @@ extension JSON {
//continuing implementation.
return nil
}
}
}*/

0 comments on commit 9390d53

Please sign in to comment.