From 003464dde89ef2dba3049bd4fae45e4c445cde88 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Wed, 7 Dec 2016 00:29:27 -0500 Subject: [PATCH] Replace NSTimeZone with TimeZone --- SwiftGit2/Objects.swift | 6 +++--- SwiftGit2Tests/ObjectsSpec.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SwiftGit2/Objects.swift b/SwiftGit2/Objects.swift index 993e08b..e9d6bed 100644 --- a/SwiftGit2/Objects.swift +++ b/SwiftGit2/Objects.swift @@ -35,14 +35,14 @@ public struct Signature { public let time: Date /// The time zone that `time` should be interpreted relative to. - public let timeZone: NSTimeZone + public let timeZone: TimeZone /// Create an instance with a libgit2 `git_signature`. public init(_ signature: git_signature) { name = String(validatingUTF8: signature.name)! email = String(validatingUTF8: signature.email)! time = Date(timeIntervalSince1970: TimeInterval(signature.when.time)) - timeZone = NSTimeZone(forSecondsFromGMT: NSInteger(60 * signature.when.offset)) + timeZone = TimeZone(secondsFromGMT: 60 * Int(signature.when.offset))! } } @@ -56,7 +56,7 @@ public func == (lhs: Signature, rhs: Signature) -> Bool { return lhs.name == rhs.name && lhs.email == rhs.email && lhs.time == rhs.time - && lhs.timeZone.secondsFromGMT == rhs.timeZone.secondsFromGMT + && lhs.timeZone == rhs.timeZone } /// A git commit. diff --git a/SwiftGit2Tests/ObjectsSpec.swift b/SwiftGit2Tests/ObjectsSpec.swift index 4d1af11..1a84a84 100644 --- a/SwiftGit2Tests/ObjectsSpec.swift +++ b/SwiftGit2Tests/ObjectsSpec.swift @@ -37,7 +37,7 @@ class SignatureSpec: QuickSpec { expect(signature.name).to(equal("Matt Diephouse")) expect(signature.email).to(equal("matt@diephouse.com")) expect(signature.time).to(equal(Date(timeIntervalSince1970: 1416186947))) - expect(signature.timeZone.abbreviation).to(equal("GMT-5")) + expect(signature.timeZone.abbreviation()).to(equal("GMT-5")) } }