Merge branch 'master' into swift_3.0 # Conflicts: # Tests/ASSET_Tests.swift # Tests/GET_Tests.swift
Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/4bcc9775 Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/4bcc9775 Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/4bcc9775 Branch: refs/heads/master Commit: 4bcc9775da0b1a77e616b9bae939d9def260925b Parents: b022377 1500c16 Author: Robert Walsh <rjwalsh1...@gmail.com> Authored: Wed Sep 14 18:07:30 2016 -0500 Committer: Robert Walsh <rjwalsh1...@gmail.com> Committed: Wed Sep 14 18:07:30 2016 -0500 ---------------------------------------------------------------------- .travis.yml | 37 ++++++++++++++++++++ README.md | 29 ++++++++++++--- Tests/ASSET_Tests.swift | 2 +- .../contents.xcworkspacedata | 7 ++++ 4 files changed, 70 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/4bcc9775/Tests/ASSET_Tests.swift ---------------------------------------------------------------------- diff --cc Tests/ASSET_Tests.swift index 0de2127,a8c8344..0bbeb92 --- a/Tests/ASSET_Tests.swift +++ b/Tests/ASSET_Tests.swift @@@ -241,12 -240,12 +241,12 @@@ class ASSET_Tests: XCTestCase "etag":"dfa7421ea4f35d33e12ba93979a46b7e", "checkSum":"dfa7421ea4f35d33e12ba93979a46b7e", "content-length":1417896, - "last-modified":1455728898545] as [String : Any] - "last-modified":Int(NSDate().timeIntervalSince1970 * Double(1000))] ++ "last-modified":Int(Date().timeIntervalSince1970 * Double(1000))] as [String : Any] - let fileMetaData = UsergridFileMetaData(fileMetaDataJSON:fileMetaDataDict as! [String : AnyObject]) + let fileMetaData = UsergridFileMetaData(fileMetaDataJSON:fileMetaDataDict) - let fileMetaDataCodingData = NSKeyedArchiver.archivedDataWithRootObject(fileMetaData) - let newInstanceFromData = NSKeyedUnarchiver.unarchiveObjectWithData(fileMetaDataCodingData) as? UsergridFileMetaData + let fileMetaDataCodingData = NSKeyedArchiver.archivedData(withRootObject: fileMetaData) + let newInstanceFromData = NSKeyedUnarchiver.unarchiveObject(with: fileMetaDataCodingData) as? UsergridFileMetaData XCTAssertNotNil(newInstanceFromData) if let newInstance = newInstanceFromData {
