development: updated for Xcode 8.3

CosmicMind · Mar 28, 2017 · 91ef7da · 91ef7da
1 parent 2bde171
commit 91ef7da
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0820"
+ LastUpgradeVersion = "0830"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Graph.xcodeproj/xcshareddata/xcschemes/Graph macOS.xcscheme b/Graph.xcodeproj/xcshareddata/xcschemes/Graph macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0820"
+ LastUpgradeVersion = "0830"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>2.1.2</string>
+ <string>2.1.3</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git 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
@@ -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
@@ -90,7 +90,7 @@ class ActionSearchTests : XCTestCase {
  }
 
  graph.sync { (success, error) in
- XCTAssertTrue(success, "\(error)")
+ XCTAssertTrue(success, "\(String(describing: error))")
  }
 
  let search = Search<Action>(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<Action>(graph: graph)

diff --git 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
@@ -90,7 +90,7 @@ class EntitySearchTests : XCTestCase {
  }
 
  graph.sync { (success, error) in
- XCTAssertTrue(success, "\(error)")
+ XCTAssertTrue(success, "\(String(describing: error))")
  }
 
  let search = Search<Entity>(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<Entity>(graph: graph)

diff --git 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
@@ -90,7 +90,7 @@ class RelationshipSearchTests : XCTestCase {
  }
 
  graph.sync { (success, error) in
- XCTAssertTrue(success, "\(error)")
+ XCTAssertTrue(success, "\(String(describing: error))")
  }
 
  let search = Search<Relationship>(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<Relationship>(graph: graph)

diff --git 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()
  }
  }