Skip to content

Commit d3d0334

Browse files
ps2ps2
authored
Merge pull request #810 from LoopKit/xcode10
Hotfix: Build on Xcode 10
2 parents f7f6fa1 + 2d62fb0 commit d3d0334

File tree

12 files changed

+25
-21
lines changed

12 files changed

+25
-21
lines changed

‎Cartfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
github "LoopKit/LoopKit" == 2.1.2
1+
github "LoopKit/LoopKit" == 2.1.3
22
github "LoopKit/CGMBLEKit" == 2.1.1
3-
github "i-schuetz/SwiftCharts" == 0.6.1
3+
github "i-schuetz/SwiftCharts" == 0.6.2
44
github "mddub/dexcom-share-client-swift" == 0.4.1
55
github "mddub/G4ShareSpy" == 0.3.3
6-
github "ps2/rileylink_ios" == 2.0.5
6+
github "ps2/rileylink_ios" == 2.0.6
77
github "LoopKit/Amplitude-iOS" "decreepify"

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
22
github "LoopKit/CGMBLEKit" "v2.1.1"
3-
github "LoopKit/LoopKit" "v2.1.2"
4-
github "i-schuetz/SwiftCharts" "0.6.1"
3+
github "LoopKit/LoopKit" "v2.1.3"
4+
github "i-schuetz/SwiftCharts" "0.6.2"
55
github "mddub/G4ShareSpy" "v0.3.3"
66
github "mddub/dexcom-share-client-swift" "v0.4.1"
7-
github "ps2/rileylink_ios" "v2.0.5"
7+
github "ps2/rileylink_ios" "v2.0.6"

‎DoseMathTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.9.1</string>
18+
<string>1.9.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Loop Status Extension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>XPC!</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.9.1</string>
22+
<string>1.9.2</string>
2323
<key>CFBundleVersion</key>
2424
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>AppGroupIdentifier</key>

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,7 @@
24422442
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
24432443
CODE_SIGN_IDENTITY = "iPhone Developer: [email protected] (XZN842LDLT)";
24442444
COPY_PHASE_STRIP = NO;
2445-
CURRENT_PROJECT_VERSION = 52;
2445+
CURRENT_PROJECT_VERSION = 53;
24462446
DEBUG_INFORMATION_FORMAT = dwarf;
24472447
ENABLE_STRICT_OBJC_MSGSEND = YES;
24482448
ENABLE_TESTABILITY = YES;
@@ -2478,7 +2478,7 @@
24782478
SWIFT_VERSION = 4.0;
24792479
TARGETED_DEVICE_FAMILY = "1,2";
24802480
WARNING_CFLAGS = "-Wall";
2481-
WATCHOS_DEPLOYMENT_TARGET = 4.3;
2481+
WATCHOS_DEPLOYMENT_TARGET = 4.1;
24822482
};
24832483
name = Debug;
24842484
};
@@ -2514,7 +2514,7 @@
25142514
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
25152515
CODE_SIGN_IDENTITY = "iPhone Developer: [email protected] (XZN842LDLT)";
25162516
COPY_PHASE_STRIP = NO;
2517-
CURRENT_PROJECT_VERSION = 52;
2517+
CURRENT_PROJECT_VERSION = 53;
25182518
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
25192519
ENABLE_NS_ASSERTIONS = NO;
25202520
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2544,7 +2544,7 @@
25442544
TARGETED_DEVICE_FAMILY = "1,2";
25452545
VALIDATE_PRODUCT = YES;
25462546
WARNING_CFLAGS = "-Wall";
2547-
WATCHOS_DEPLOYMENT_TARGET = 4.3;
2547+
WATCHOS_DEPLOYMENT_TARGET = 4.1;
25482548
};
25492549
name = Release;
25502550
};
@@ -2765,11 +2765,11 @@
27652765
CLANG_WARN_SUSPICIOUS_MOVES = YES;
27662766
CODE_SIGN_IDENTITY = "";
27672767
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
2768-
CURRENT_PROJECT_VERSION = 52;
2768+
CURRENT_PROJECT_VERSION = 53;
27692769
DEFINES_MODULE = YES;
27702770
DEVELOPMENT_TEAM = "";
27712771
DYLIB_COMPATIBILITY_VERSION = 1;
2772-
DYLIB_CURRENT_VERSION = 52;
2772+
DYLIB_CURRENT_VERSION = 53;
27732773
DYLIB_INSTALL_NAME_BASE = "@rpath";
27742774
INFOPLIST_FILE = LoopUI/Info.plist;
27752775
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -2792,11 +2792,11 @@
27922792
CLANG_WARN_SUSPICIOUS_MOVES = YES;
27932793
CODE_SIGN_IDENTITY = "";
27942794
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
2795-
CURRENT_PROJECT_VERSION = 52;
2795+
CURRENT_PROJECT_VERSION = 53;
27962796
DEFINES_MODULE = YES;
27972797
DEVELOPMENT_TEAM = "";
27982798
DYLIB_COMPATIBILITY_VERSION = 1;
2799-
DYLIB_CURRENT_VERSION = 52;
2799+
DYLIB_CURRENT_VERSION = 53;
28002800
DYLIB_INSTALL_NAME_BASE = "@rpath";
28012801
INFOPLIST_FILE = LoopUI/Info.plist;
28022802
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

‎Loop/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.9.1</string>
22+
<string>1.9.2</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>

‎LoopTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.9.1</string>
18+
<string>1.9.2</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎LoopUI/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.9.1</string>
20+
<string>1.9.2</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSPrincipalClass</key>

‎WatchApp Extension/ComplicationController.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
9292
let timeText = CLKRelativeDateTextProvider(date: Date(), style: .natural, units: .minute)
9393

9494
switch complication.family {
95+
case .graphicCorner, .graphicCircular, .graphicRectangular, .graphicBezel:
96+
template = nil
9597
case .modularSmall:
9698
let modularSmall = CLKComplicationTemplateModularSmallStackText()
9799
modularSmall.line1TextProvider = glucoseText

‎WatchApp Extension/Extensions/CLKComplicationTemplate.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ extension CLKComplicationTemplate {
4747
timeFormatter.timeStyle = .short
4848

4949
switch family {
50+
case .graphicCorner, .graphicCircular, .graphicRectangular, .graphicBezel:
51+
return nil
5052
case .modularSmall:
5153
let template = CLKComplicationTemplateModularSmallStackText()
5254
template.line1TextProvider = glucoseAndTrendText

0 commit comments

Comments
 (0)