Skip to content

Commit dc35b5b

Browse files
ps2ps2
authored
Merge pull request #1397 from LoopKit/dev
Release 2.2.4
2 parents a1e5e91 + 4c3bf0c commit dc35b5b

File tree

14 files changed

+73
-29
lines changed

14 files changed

+73
-29
lines changed

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
22
github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
33
github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
4-
github "LoopKit/LoopKit" "953b58e617379354b89ea33e0fd8f220ccc2d366"
4+
github "LoopKit/LoopKit" "5f459ee56ecd17c740c5fa0142353f3eb5b6120d"
55
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
66
github "LoopKit/dexcom-share-client-swift" "68ea5d08588e00bf148518b126416b8352dbef64"
77
github "i-schuetz/SwiftCharts" "0.6.5"
8-
github "ps2/rileylink_ios" "cd9be51111c9ce40d86c0fe4f57660055995c922"
8+
github "ps2/rileylink_ios" "4ca67f4ac2dd5b15c6b7e19c448eb2d52b9592a7"

‎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>2.2.3</string>
18+
<string>2.2.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Learn/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>2.2.3</string>
22+
<string>2.2.4</string>
2323
<key>CFBundleVersion</key>
2424
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>LSRequiresIPhoneOS</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>2.2.3</string>
22+
<string>2.2.4</string>
2323
<key>CFBundleVersion</key>
2424
<string>$(CURRENT_PROJECT_VERSION)</string>
2525
<key>MainAppBundleIdentifier</key>

‎Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,18 @@
8888
debugServiceExtension = "internal"
8989
allowLocationSimulation = "YES"
9090
launchAutomaticallySubstyle = "32">
91-
<BuildableProductRunnable
92-
runnableDebuggingMode = "0">
91+
<RemoteRunnable
92+
runnableDebuggingMode = "2"
93+
BundleIdentifier = "com.apple.Carousel"
94+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9395
<BuildableReference
9496
BuildableIdentifier = "primary"
9597
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9698
BuildableName = "WatchApp.app"
9799
BlueprintName = "WatchApp"
98100
ReferencedContainer = "container:Loop.xcodeproj">
99101
</BuildableReference>
100-
</BuildableProductRunnable>
102+
</RemoteRunnable>
101103
</LaunchAction>
102104
<ProfileAction
103105
buildConfiguration = "Release"
@@ -106,16 +108,27 @@
106108
useCustomWorkingDirectory = "NO"
107109
debugDocumentVersioning = "YES"
108110
launchAutomaticallySubstyle = "32">
109-
<BuildableProductRunnable
110-
runnableDebuggingMode = "0">
111+
<RemoteRunnable
112+
runnableDebuggingMode = "2"
113+
BundleIdentifier = "com.apple.Carousel"
114+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
111115
<BuildableReference
112116
BuildableIdentifier = "primary"
113117
BlueprintIdentifier = "43A943711B926B7B0051FA24"
114118
BuildableName = "WatchApp.app"
115119
BlueprintName = "WatchApp"
116120
ReferencedContainer = "container:Loop.xcodeproj">
117121
</BuildableReference>
118-
</BuildableProductRunnable>
122+
</RemoteRunnable>
123+
<MacroExpansion>
124+
<BuildableReference
125+
BuildableIdentifier = "primary"
126+
BlueprintIdentifier = "43A943711B926B7B0051FA24"
127+
BuildableName = "WatchApp.app"
128+
BlueprintName = "WatchApp"
129+
ReferencedContainer = "container:Loop.xcodeproj">
130+
</BuildableReference>
131+
</MacroExpansion>
119132
</ProfileAction>
120133
<AnalyzeAction
121134
buildConfiguration = "Debug">

‎Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,18 @@
8989
allowLocationSimulation = "YES"
9090
launchAutomaticallySubstyle = "8"
9191
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
92-
<BuildableProductRunnable
93-
runnableDebuggingMode = "0">
92+
<RemoteRunnable
93+
runnableDebuggingMode = "2"
94+
BundleIdentifier = "com.apple.Carousel"
95+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9496
<BuildableReference
9597
BuildableIdentifier = "primary"
9698
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9799
BuildableName = "WatchApp.app"
98100
BlueprintName = "WatchApp"
99101
ReferencedContainer = "container:Loop.xcodeproj">
100102
</BuildableReference>
101-
</BuildableProductRunnable>
103+
</RemoteRunnable>
102104
</LaunchAction>
103105
<ProfileAction
104106
buildConfiguration = "Release"
@@ -108,16 +110,27 @@
108110
debugDocumentVersioning = "YES"
109111
launchAutomaticallySubstyle = "8"
110112
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
111-
<BuildableProductRunnable
112-
runnableDebuggingMode = "0">
113+
<RemoteRunnable
114+
runnableDebuggingMode = "2"
115+
BundleIdentifier = "com.apple.Carousel"
116+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
113117
<BuildableReference
114118
BuildableIdentifier = "primary"
115119
BlueprintIdentifier = "43A943711B926B7B0051FA24"
116120
BuildableName = "WatchApp.app"
117121
BlueprintName = "WatchApp"
118122
ReferencedContainer = "container:Loop.xcodeproj">
119123
</BuildableReference>
120-
</BuildableProductRunnable>
124+
</RemoteRunnable>
125+
<MacroExpansion>
126+
<BuildableReference
127+
BuildableIdentifier = "primary"
128+
BlueprintIdentifier = "43A943711B926B7B0051FA24"
129+
BuildableName = "WatchApp.app"
130+
BlueprintName = "WatchApp"
131+
ReferencedContainer = "container:Loop.xcodeproj">
132+
</BuildableReference>
133+
</MacroExpansion>
121134
</ProfileAction>
122135
<AnalyzeAction
123136
buildConfiguration = "Debug">

‎Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,18 @@
8888
debugServiceExtension = "internal"
8989
allowLocationSimulation = "YES"
9090
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
91-
<BuildableProductRunnable
92-
runnableDebuggingMode = "0">
91+
<RemoteRunnable
92+
runnableDebuggingMode = "2"
93+
BundleIdentifier = "com.apple.Carousel"
94+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
9395
<BuildableReference
9496
BuildableIdentifier = "primary"
9597
BlueprintIdentifier = "43A943711B926B7B0051FA24"
9698
BuildableName = "WatchApp.app"
9799
BlueprintName = "WatchApp"
98100
ReferencedContainer = "container:Loop.xcodeproj">
99101
</BuildableReference>
100-
</BuildableProductRunnable>
102+
</RemoteRunnable>
101103
</LaunchAction>
102104
<ProfileAction
103105
buildConfiguration = "Release"
@@ -106,16 +108,27 @@
106108
useCustomWorkingDirectory = "NO"
107109
debugDocumentVersioning = "YES"
108110
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
109-
<BuildableProductRunnable
110-
runnableDebuggingMode = "0">
111+
<RemoteRunnable
112+
runnableDebuggingMode = "2"
113+
BundleIdentifier = "com.apple.Carousel"
114+
RemotePath = "/$(MAIN_APP_DISPLAY_NAME)">
111115
<BuildableReference
112116
BuildableIdentifier = "primary"
113117
BlueprintIdentifier = "43A943711B926B7B0051FA24"
114118
BuildableName = "WatchApp.app"
115119
BlueprintName = "WatchApp"
116120
ReferencedContainer = "container:Loop.xcodeproj">
117121
</BuildableReference>
118-
</BuildableProductRunnable>
122+
</RemoteRunnable>
123+
<MacroExpansion>
124+
<BuildableReference
125+
BuildableIdentifier = "primary"
126+
BlueprintIdentifier = "43A943711B926B7B0051FA24"
127+
BuildableName = "WatchApp.app"
128+
BlueprintName = "WatchApp"
129+
ReferencedContainer = "container:Loop.xcodeproj">
130+
</BuildableReference>
131+
</MacroExpansion>
119132
</ProfileAction>
120133
<AnalyzeAction
121134
buildConfiguration = "Debug">

‎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>2.2.3</string>
22+
<string>2.2.4</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>

‎Loop/View Controllers/CarbEntryViewController.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ final class CarbEntryViewController: ChartsTableViewController, IdentifiableClas
219219
cell.titleLabel.text = NSLocalizedString("Date", comment: "Title of the carb entry date picker cell")
220220
cell.datePicker.isEnabled = isSampleEditable
221221
cell.datePicker.datePickerMode = .dateAndTime
222+
#if swift(>=5.2)
223+
if #available(iOS 14.0, *) {
224+
cell.datePicker.preferredDatePickerStyle = .wheels
225+
}
226+
#endif
222227
cell.datePicker.maximumDate = Date(timeIntervalSinceNow: maximumDateFutureInterval)
223228
cell.datePicker.minuteInterval = 1
224229
cell.date = date

‎LoopCore/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>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.2.3</string>
18+
<string>2.2.4</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
</dict>

0 commit comments

Comments
 (0)