From 91ef7da86779445ac16f2b913e9a765062a1275b Mon Sep 17 00:00:00 2001 From: Daniel Dahan Date: Tue, 28 Mar 2017 13:24:08 -0600 Subject: [PATCH] development: updated for Xcode 8.3 --- Graph.podspec | 2 +- Graph.xcodeproj/xcshareddata/xcschemes/Graph iOS.xcscheme | 2 +- Graph.xcodeproj/xcshareddata/xcschemes/Graph macOS.xcscheme | 2 +- Sources/Info.plist | 2 +- Sources/JSON.swift | 2 +- Sources/Relationship.swift | 2 +- Tests/ActionSearchTests.swift | 4 ++-- Tests/ActionThreadTests.swift | 6 +++--- Tests/EntitySearchTests.swift | 4 ++-- Tests/EntityThreadTests.swift | 6 +++--- Tests/RelationshipSearchTests.swift | 4 ++-- Tests/RelationshipThreadTests.swift | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Graph.podspec b/Graph.podspec index 3f5756f4..f63d5d16 100755 --- a/Graph.podspec +++ b/Graph.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Graph' - s.version = '2.1.2' + s.version = '2.1.3' s.license = 'BSD-3-Clause' s.summary = 'Graph is a semantic database that is used to create data-driven applications.' s.homepage = 'http://graphswift.io' diff --git a/Graph.xcodeproj/xcshareddata/xcschemes/Graph iOS.xcscheme b/Graph.xcodeproj/xcshareddata/xcschemes/Graph iOS.xcscheme index e5872f75..20304c9d 100644 --- a/Graph.xcodeproj/xcshareddata/xcschemes/Graph iOS.xcscheme +++ b/Graph.xcodeproj/xcshareddata/xcschemes/Graph iOS.xcscheme @@ -1,6 +1,6 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.1.2 + 2.1.3 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/JSON.swift b/Sources/JSON.swift index 67d3bb03..e385458f 100644 --- a/Sources/JSON.swift +++ b/Sources/JSON.swift @@ -125,7 +125,7 @@ open class JSON: Equatable, CustomStringConvertible { if let o = object as? JSON { return stringify(object: o.object) } else if let data = JSON.serialize(object: object) { - if let o = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as? String { + if let o = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as String? { return o } } diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift index 3b52be33..61872b15 100644 --- a/Sources/Relationship.swift +++ b/Sources/Relationship.swift @@ -36,7 +36,7 @@ public class Relationship: Node { internal let managedNode: ManagedRelationship public override var description: String { - return "[nodeClass: \(nodeClass), id: \(id), type: \(type), tags: \(tags), groups: \(groups), properties: \(properties), subject: \(subject), object: \(object), createdDate: \(createdDate)]" + return "[nodeClass: \(nodeClass), id: \(id), type: \(type), tags: \(tags), groups: \(groups), properties: \(properties), subject: \(String(describing: subject)), object: \(String(describing: object)), createdDate: \(createdDate)]" } /// A reference to the nodeClass. diff --git a/Tests/ActionSearchTests.swift b/Tests/ActionSearchTests.swift index f3025762..e8c261d9 100644 --- a/Tests/ActionSearchTests.swift +++ b/Tests/ActionSearchTests.swift @@ -90,7 +90,7 @@ class ActionSearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) @@ -160,7 +160,7 @@ class ActionSearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) diff --git a/Tests/ActionThreadTests.swift b/Tests/ActionThreadTests.swift index 9a20230d..76bec356 100644 --- a/Tests/ActionThreadTests.swift +++ b/Tests/ActionThreadTests.swift @@ -72,7 +72,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { action.add(tags: "G") graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.insertSaveExpectation?.fulfill() } } @@ -86,7 +86,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { action["P"] = 222 graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.updateSaveExpectation?.fulfill() } } @@ -102,7 +102,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { action.delete() graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.deleteSaveExpectation?.fulfill() } } diff --git a/Tests/EntitySearchTests.swift b/Tests/EntitySearchTests.swift index d3b19dfa..46a12d0a 100644 --- a/Tests/EntitySearchTests.swift +++ b/Tests/EntitySearchTests.swift @@ -90,7 +90,7 @@ class EntitySearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) @@ -160,7 +160,7 @@ class EntitySearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) diff --git a/Tests/EntityThreadTests.swift b/Tests/EntityThreadTests.swift index 77acdb49..77f08235 100644 --- a/Tests/EntityThreadTests.swift +++ b/Tests/EntityThreadTests.swift @@ -72,7 +72,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { entity.add(tags: "G") graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.insertSaveExpectation?.fulfill() } } @@ -86,7 +86,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { entity["P"] = 222 graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.updateSaveExpectation?.fulfill() } } @@ -102,7 +102,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { entity.delete() graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.deleteSaveExpectation?.fulfill() } } diff --git a/Tests/RelationshipSearchTests.swift b/Tests/RelationshipSearchTests.swift index 31f5c550..6f343907 100644 --- a/Tests/RelationshipSearchTests.swift +++ b/Tests/RelationshipSearchTests.swift @@ -90,7 +90,7 @@ class RelationshipSearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) @@ -160,7 +160,7 @@ class RelationshipSearchTests : XCTestCase { } graph.sync { (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") } let search = Search(graph: graph) diff --git a/Tests/RelationshipThreadTests.swift b/Tests/RelationshipThreadTests.swift index ac4cacd9..b6be0f9b 100644 --- a/Tests/RelationshipThreadTests.swift +++ b/Tests/RelationshipThreadTests.swift @@ -72,7 +72,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { relationship.add(tags: "G") graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.insertSaveExpectation?.fulfill() } } @@ -86,7 +86,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { relationship["P"] = 222 graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.updateSaveExpectation?.fulfill() } } @@ -102,7 +102,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { relationship.delete() graph.async { [weak self] (success, error) in - XCTAssertTrue(success, "\(error)") + XCTAssertTrue(success, "\(String(describing: error))") self?.deleteSaveExpectation?.fulfill() } }