diff --git a/.travis.yml b/.travis.yml
index 6418ed5685..d695f5dfe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10
# xcode_sdk: iphonesimulator11
# xcode_project: Loop.xcodeproj
# xcode_scheme: Loop
diff --git a/Cartfile b/Cartfile
index e5f5f541d0..55c17b5336 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 2.1.2
+github "LoopKit/LoopKit" == 2.1.5
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.7
github "LoopKit/Amplitude-iOS" "decreepify"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index c4116945df..21812dd5c7 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.5"
+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.7"
diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist
index 620b744b1f..d4152c96a0 100644
--- a/DoseMathTests/Info.plist
+++ b/DoseMathTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
CFBundleSignature
????
CFBundleVersion
diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist
index 53b5687404..613009f16d 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.3
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
AppGroupIdentifier
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index e6ff5f7a88..4f7d8df250 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 = 54;
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 = 54;
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 = 54;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 52;
+ DYLIB_CURRENT_VERSION = 54;
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 = 54;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 52;
+ DYLIB_CURRENT_VERSION = 54;
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..51de45c8dc 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
CFBundleSignature
????
CFBundleURLTypes
diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist
index 620b744b1f..d4152c96a0 100644
--- a/LoopTests/Info.plist
+++ b/LoopTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
CFBundleSignature
????
CFBundleVersion
diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist
index 8a725819e0..8ac931c440 100644
--- a/LoopUI/Info.plist
+++ b/LoopUI/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
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..72ad48bfe9 100644
--- a/WatchApp Extension/Info.plist
+++ b/WatchApp Extension/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
CFBundleSignature
????
CFBundleVersion
diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist
index 9714e9247c..750ca80dd6 100644
--- a/WatchApp/Info.plist
+++ b/WatchApp/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.9.1
+ 1.9.3
CFBundleSignature
????
CFBundleVersion