Merge pull request LoopKit#247 from LoopKit/dev

Release 2.2

Author: ps2

.travis.yml

@@ -1,10 +1,8 @@
 language: objective-c
-osx_image: xcode9.3
-#xcode_sdk: iphonesimulator11.3
-#xcode_project: LoopKit.xcodeproj
+osx_image: xcode10
 xcode_scheme:
     - LoopKit
     - LoopKitUI
 script:
-   - xcodebuild -project LoopKit.xcodeproj -scheme LoopKit build -destination 'name=iPhone X' test
-   - xcodebuild -project LoopKit.xcodeproj -scheme "LoopKit Example" build -destination 'name=iPhone X'
+   - xcodebuild -project LoopKit.xcodeproj -scheme LoopKit build -destination 'name=iPhone SE' test
+   - xcodebuild -project LoopKit.xcodeproj -scheme "LoopKit Example" build -destination 'name=iPhone SE'

Common/LocalizedString.swift

@@ -12,6 +12,10 @@ private class FrameworkBundle {
     static let main = Bundle(for: FrameworkBundle.self)
 }
 
-func LocalizedString(_ key: String, tableName: String? = nil, value: String = "", comment: String) -> String {
-    return NSLocalizedString(key, tableName: tableName, bundle: FrameworkBundle.main, value: value, comment: comment)
+func LocalizedString(_ key: String, tableName: String? = nil, value: String? = nil, comment: String) -> String {
+    if let value = value {
+        return NSLocalizedString(key, tableName: tableName, bundle: FrameworkBundle.main, value: value, comment: comment)
+    } else {
+        return NSLocalizedString(key, tableName: tableName, bundle: FrameworkBundle.main, comment: comment)
+    }
 }

LoopKit Example/AppDelegate.swift

@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         return true
     }
 

LoopKit Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.5</string>
+	<string>2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

LoopKit ExampleUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.5</string>
+	<string>2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

LoopKit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKitUI.xcscheme

@@ -33,12 +33,19 @@ public protocol CGMManagerDelegate: class {
     ///   - manager: The manager instance
     ///   - result: The result of the update
     func cgmManager(_ manager: CGMManager, didUpdateWith result: CGMResult) -> Void
+
+    /// Informs the delegate that the manager is deactivating and should be deleted
+    ///
+    /// - Parameter manager: The manager instance
+    func cgmManagerWantsDeletion(_ manager: CGMManager)
 }
 
 
-public protocol CGMManager: CustomDebugStringConvertible {
+public protocol CGMManager: DeviceManager {
     var cgmManagerDelegate: CGMManagerDelegate? { get set }
 
+    var appURL: URL? { get }
+
     /// Whether the device is capable of waking the app
     var providesBLEHeartbeat: Bool { get }
 
@@ -58,3 +65,10 @@ public protocol CGMManager: CustomDebugStringConvertible {
     ///   - completion: A closure called when operation has completed
     func fetchNewDataIfNeeded(_ completion: @escaping (CGMResult) -> Void) -> Void
 }
+
+
+public extension CGMManager {
+    var appURL: URL? {
+        return nil
+    }
+}