Skip to content

Updates for Swift 2.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates for Swift 2.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0537886
Converted to Swift 2.0 syntax
podkovyrin Sep 25, 2015
a843ac8
Used protocol extenstions
podkovyrin Sep 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions OptJSON.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
50FCCCA6195C5F2100095152 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftMigration = 0700;
LastUpgradeCheck = 0600;
TargetAttributes = {
50FCCCAE195C5F2100095152 = {
Expand Down Expand Up @@ -360,10 +361,6 @@
50FCCCC9195C5F2100095152 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -378,10 +375,6 @@
50FCCCCA195C5F2100095152 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = OptJSONTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
METAL_ENABLE_DEBUG_INFO = NO;
Expand Down
28 changes: 11 additions & 17 deletions OptJSON/OptJSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,27 @@
import Foundation

public protocol JSONValue {
subscript(#key: String) -> JSONValue? { get }
subscript(#index: Int) -> JSONValue? { get }
subscript(key key: String) -> JSONValue? { get }
subscript(index index: Int) -> JSONValue? { get }
}

extension NSNull : JSONValue {
public subscript(#key: String) -> JSONValue? { return nil }
public subscript(#index: Int) -> JSONValue? { return nil }
extension JSONValue {
public subscript(key key: String) -> JSONValue? { return nil }
public subscript(index index: Int) -> JSONValue? { return nil }
}

extension NSNumber : JSONValue {
public subscript(#key: String) -> JSONValue? { return nil }
public subscript(#index: Int) -> JSONValue? { return nil }
}
extension NSNull : JSONValue { }

extension NSString : JSONValue {
public subscript(#key: String) -> JSONValue? { return nil }
public subscript(#index: Int) -> JSONValue? { return nil }
}
extension NSNumber : JSONValue { }

extension NSString : JSONValue { }

extension NSArray : JSONValue {
public subscript(#key: String) -> JSONValue? { return nil }
public subscript(#index: Int) -> JSONValue? { return index < count && index >= 0 ? JSON(self[index]) : nil }
public subscript(index index: Int) -> JSONValue? { return index < count && index >= 0 ? JSON(self[index]) : nil }
}

extension NSDictionary : JSONValue {
public subscript(#key: String) -> JSONValue? { return JSON(self[key]) }
public subscript(#index: Int) -> JSONValue? { return nil }
public subscript(key key: String) -> JSONValue? { return JSON(self[key]) }
}

public func JSON(object: AnyObject?) -> JSONValue? {
Expand Down
4 changes: 2 additions & 2 deletions OptJSONTests/AltJSONTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ let altJSON : AltJSON = [
class AltJSONTests: XCTestCase {

let nsJSON : AnyObject! = {
let data = NSJSONSerialization.dataWithJSONObject(altJSON, options: NSJSONWritingOptions(0), error: nil)
return NSJSONSerialization.JSONObjectWithData(data!, options: NSJSONReadingOptions(0), error: nil)
let data = try? NSJSONSerialization.dataWithJSONObject(altJSON, options: NSJSONWritingOptions(rawValue: 0))
return try? NSJSONSerialization.JSONObjectWithData(data!, options: NSJSONReadingOptions(rawValue: 0))
}()

func testBaseTypes() {
Expand Down
4 changes: 2 additions & 2 deletions OptJSONTests/OptJSONTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ let nativeJSON = [
class OptJSONTests: XCTestCase {

let nsJSON : AnyObject! = {
let data = NSJSONSerialization.dataWithJSONObject(nativeJSON, options: NSJSONWritingOptions(0), error: nil)
return NSJSONSerialization.JSONObjectWithData(data!, options: NSJSONReadingOptions(0), error: nil)
let data = try? NSJSONSerialization.dataWithJSONObject(nativeJSON, options: NSJSONWritingOptions(rawValue: 0))
return try? NSJSONSerialization.JSONObjectWithData(data!, options: NSJSONReadingOptions(rawValue: 0))
}()

func testBaseTypes() {
Expand Down