Merge pull request #362 from ps2/dev

v1.2.2
ps2 · Sep 18, 2017 · 882ba30 · 882ba30
2 parents 6d14ddb + 1ef7263
commit 882ba30
Show file tree

Hide file tree

Showing 24 changed files with 89 additions and 83 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode8.3
-xcode_sdk: iphonesimulator10.3
+osx_image: xcode9
+xcode_sdk: iphonesimulator11
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:
- - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink -sdk iphonesimulator10.3 build -destination 'name=iPhone SE' test
+ - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink build -destination 'name=iPhone SE' test
diff --git a/Crypto/Info.plist b/Crypto/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>1.2.1</string>
+ <string>1.2.2</string>
  <key>CFBundleVersion</key>
  <string>$(CURRENT_PROJECT_VERSION)</string>
  <key>NSPrincipalClass</key>

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

diff --git a/MinimedKitTests/BasalScheduleTests.swift b/MinimedKitTests/BasalScheduleTests.swift
@@ -24,20 +24,20 @@ class BasalScheduleTests: XCTestCase {
  // Test each element
  XCTAssertEqual(basalSchedule[0].index, 0)
  XCTAssertEqual(basalSchedule[0].timeOffset, TimeInterval(minutes: 0))
- XCTAssertEqualWithAccuracy(basalSchedule[0].rate, 0.15, accuracy: .ulpOfOne)
+ XCTAssertEqual(basalSchedule[0].rate, 0.15, accuracy: .ulpOfOne)
 
  XCTAssertEqual(basalSchedule[1].index, 1)
  XCTAssertEqual(basalSchedule[1].timeOffset, TimeInterval(minutes: 30))
- XCTAssertEqualWithAccuracy(basalSchedule[1].rate, 2.05, accuracy: .ulpOfOne)
+ XCTAssertEqual(basalSchedule[1].rate, 2.05, accuracy: .ulpOfOne)
 
  // Tests parsing rates that take two bytes to encode
  XCTAssertEqual(basalSchedule[2].index, 2)
  XCTAssertEqual(basalSchedule[2].timeOffset, TimeInterval(minutes: 60))
- XCTAssertEqualWithAccuracy(basalSchedule[2].rate, 35.00, accuracy: .ulpOfOne)
+ XCTAssertEqual(basalSchedule[2].rate, 35.00, accuracy: .ulpOfOne)
 
  // Tests parsing entry on the second page
  XCTAssertEqual(basalSchedule[25].index, 25)
  XCTAssertEqual(basalSchedule[25].timeOffset, TimeInterval(minutes: 750))
- XCTAssertEqualWithAccuracy(basalSchedule[25].rate, 0.05, accuracy: .ulpOfOne)
+ XCTAssertEqual(basalSchedule[25].rate, 0.05, accuracy: .ulpOfOne)
  }
 }
diff --git a/MinimedKitTests/Info.plist b/MinimedKitTests/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.2.1</string>
+ <string>1.2.2</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git a/MinimedKitTests/NSStringExtensions.swift b/MinimedKitTests/NSStringExtensions.swift
@@ -14,7 +14,7 @@ extension String {
  if newLength < toLength {
  return String(repeatElement(character, count: toLength - newLength)) + self
  } else {
- return self.substring(from: index(self.startIndex, offsetBy: newLength - toLength))
+ return String(self[index(startIndex, offsetBy: newLength - toLength)...])
  }
  }
 }
diff --git a/NightscoutUploadKit/Info.plist b/NightscoutUploadKit/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>1.2.1</string>
+ <string>1.2.2</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git a/NightscoutUploadKitTests/Info.plist b/NightscoutUploadKitTests/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.2.1</string>
+ <string>1.2.2</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>