Merge pull request #17 from loudnate/dependencies

loudnate · loudnate · commit c021060c06e0 · 2016-02-18T21:35:19.000-08:00
Simplifying the carthage build dependencies
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1 @@
-# github "RNCryptor/RNCryptor" ~> 4.0
-
-github "soffes/Crypto"
+github "loudnate/Crypto" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "soffes/Crypto" "v0.3.0"
+github "loudnate/Crypto" "3e9fd522eba2b95c648229f9804b34773bb340a0"
diff --git a/Example/xDripG5/NSUserDefaults.swift b/Example/xDripG5/NSUserDefaults.swift
@@ -21,13 +21,15 @@ extension NSUserDefaults {
 
     var startTimeInterval: NSTimeInterval? {
         get {
-            return doubleForKey("startTimeInterval")
+            let value = doubleForKey("startTimeInterval")
+
+            return value > 0 ? value : nil
         }
         set {
             if let value = newValue {
                 setDouble(value, forKey: "startTimeInterval")
             } else {
-                setNilValueForKey("startTimeInterval")
+                removeObjectforKey("startTimeInterval")
             }
         }
     }
diff --git a/xDripG5.podspec b/xDripG5.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "xDripG5"
-  s.version          = "0.2.1"
+  s.version          = "0.2.2"
   s.summary          = "An interface for communicating with the G5 glucose transmitter over Bluetooth."
 
   s.description      = <<-DESC
diff --git a/xDripG5/Info.plist b/xDripG5/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.1</string>
+	<string>0.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "soffes/Crypto" "v0.3.0"`
	`1`	`+github "loudnate/Crypto" "3e9fd522eba2b95c648229f9804b34773bb340a0"`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,15 @@ extension NSUserDefaults {`
`21`	`21`
`22`	`22`	`var startTimeInterval: NSTimeInterval? {`
`23`	`23`	`get {`
`24`		`- return doubleForKey("startTimeInterval")`
	`24`	`+ let value = doubleForKey("startTimeInterval")`
	`25`	`+`
	`26`	`+ return value > 0 ? value : nil`
`25`	`27`	`}`
`26`	`28`	`set {`
`27`	`29`	`if let value = newValue {`
`28`	`30`	`setDouble(value, forKey: "startTimeInterval")`
`29`	`31`	`} else {`
`30`		`- setNilValueForKey("startTimeInterval")`
	`32`	`+ removeObjectforKey("startTimeInterval")`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`}`