From 2d62fb0c933527276b898ea89cd5fe03b4b61a2e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 17 Sep 2018 21:17:55 -0500 Subject: [PATCH] Hotfix to use LoopKit with WatchOS 4.1 support --- Cartfile | 6 +++--- Cartfile.resolved | 6 +++--- DoseMathTests/Info.plist | 2 +- Loop Status Extension/Info.plist | 2 +- Loop.xcodeproj/project.pbxproj | 16 ++++++++-------- Loop/Info.plist | 2 +- LoopTests/Info.plist | 2 +- LoopUI/Info.plist | 2 +- WatchApp Extension/ComplicationController.swift | 2 ++ .../Extensions/CLKComplicationTemplate.swift | 2 ++ WatchApp Extension/Info.plist | 2 +- WatchApp/Info.plist | 2 +- 12 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Cartfile b/Cartfile index e5f5f541d0..17e1ca9dc5 100644 --- a/Cartfile +++ b/Cartfile @@ -1,7 +1,7 @@ -github "LoopKit/LoopKit" == 2.1.2 +github "LoopKit/LoopKit" == 2.1.3 github "LoopKit/CGMBLEKit" == 2.1.1 -github "i-schuetz/SwiftCharts" == 0.6.1 +github "i-schuetz/SwiftCharts" == 0.6.2 github "mddub/dexcom-share-client-swift" == 0.4.1 github "mddub/G4ShareSpy" == 0.3.3 -github "ps2/rileylink_ios" == 2.0.5 +github "ps2/rileylink_ios" == 2.0.6 github "LoopKit/Amplitude-iOS" "decreepify" diff --git a/Cartfile.resolved b/Cartfile.resolved index c4116945df..0071486027 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270" github "LoopKit/CGMBLEKit" "v2.1.1" -github "LoopKit/LoopKit" "v2.1.2" -github "i-schuetz/SwiftCharts" "0.6.1" +github "LoopKit/LoopKit" "v2.1.3" +github "i-schuetz/SwiftCharts" "0.6.2" github "mddub/G4ShareSpy" "v0.3.3" github "mddub/dexcom-share-client-swift" "v0.4.1" -github "ps2/rileylink_ios" "v2.0.5" +github "ps2/rileylink_ios" "v2.0.6" diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist index 620b744b1f..4507c55102 100644 --- a/DoseMathTests/Info.plist +++ b/DoseMathTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleSignature ???? CFBundleVersion diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist index 53b5687404..0e43389ef6 100644 --- a/Loop Status Extension/Info.plist +++ b/Loop Status Extension/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleVersion $(CURRENT_PROJECT_VERSION) AppGroupIdentifier diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index e6ff5f7a88..3365a8388a 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -2442,7 +2442,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -2478,7 +2478,7 @@ SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = "-Wall"; - WATCHOS_DEPLOYMENT_TARGET = 4.3; + WATCHOS_DEPLOYMENT_TARGET = 4.1; }; name = Debug; }; @@ -2514,7 +2514,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2544,7 +2544,7 @@ TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = "-Wall"; - WATCHOS_DEPLOYMENT_TARGET = 4.3; + WATCHOS_DEPLOYMENT_TARGET = 4.1; }; name = Release; }; @@ -2765,11 +2765,11 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 52; + DYLIB_CURRENT_VERSION = 53; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = LoopUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -2792,11 +2792,11 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 53; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 52; + DYLIB_CURRENT_VERSION = 53; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = LoopUI/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/Loop/Info.plist b/Loop/Info.plist index a6a0f952be..e5951d83e9 100644 --- a/Loop/Info.plist +++ b/Loop/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist index 620b744b1f..4507c55102 100644 --- a/LoopTests/Info.plist +++ b/LoopTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleSignature ???? CFBundleVersion diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist index 8a725819e0..ead3c07674 100644 --- a/LoopUI/Info.plist +++ b/LoopUI/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/WatchApp Extension/ComplicationController.swift b/WatchApp Extension/ComplicationController.swift index 8caa3c1de3..4b149cabb1 100644 --- a/WatchApp Extension/ComplicationController.swift +++ b/WatchApp Extension/ComplicationController.swift @@ -92,6 +92,8 @@ final class ComplicationController: NSObject, CLKComplicationDataSource { let timeText = CLKRelativeDateTextProvider(date: Date(), style: .natural, units: .minute) switch complication.family { + case .graphicCorner, .graphicCircular, .graphicRectangular, .graphicBezel: + template = nil case .modularSmall: let modularSmall = CLKComplicationTemplateModularSmallStackText() modularSmall.line1TextProvider = glucoseText diff --git a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift index 7275837669..1a3e54331f 100644 --- a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift +++ b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift @@ -47,6 +47,8 @@ extension CLKComplicationTemplate { timeFormatter.timeStyle = .short switch family { + case .graphicCorner, .graphicCircular, .graphicRectangular, .graphicBezel: + return nil case .modularSmall: let template = CLKComplicationTemplateModularSmallStackText() template.line1TextProvider = glucoseAndTrendText diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist index 6fe0921a18..44c9ce1e78 100644 --- a/WatchApp Extension/Info.plist +++ b/WatchApp Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleSignature ???? CFBundleVersion diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist index 9714e9247c..6817e1d304 100644 --- a/WatchApp/Info.plist +++ b/WatchApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.9.1 + 1.9.2 CFBundleSignature ???? CFBundleVersion