diff --git a/Cartfile.resolved b/Cartfile.resolved
index 7afc2d5f77..b6cc1373e7 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,8 +1,8 @@
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
-github "LoopKit/LoopKit" "953b58e617379354b89ea33e0fd8f220ccc2d366"
+github "LoopKit/LoopKit" "5f459ee56ecd17c740c5fa0142353f3eb5b6120d"
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
github "LoopKit/dexcom-share-client-swift" "68ea5d08588e00bf148518b126416b8352dbef64"
github "i-schuetz/SwiftCharts" "0.6.5"
-github "ps2/rileylink_ios" "cd9be51111c9ce40d86c0fe4f57660055995c922"
+github "ps2/rileylink_ios" "4ca67f4ac2dd5b15c6b7e19c448eb2d52b9592a7"
diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist
index 014370f7bf..256dd347c3 100644
--- a/DoseMathTests/Info.plist
+++ b/DoseMathTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleSignature
????
CFBundleVersion
diff --git a/Learn/Info.plist b/Learn/Info.plist
index ffd9ca349f..b450c279f5 100644
--- a/Learn/Info.plist
+++ b/Learn/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
LSRequiresIPhoneOS
diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist
index e9c7d51659..b1411165f1 100644
--- a/Loop Status Extension/Info.plist
+++ b/Loop Status Extension/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
MainAppBundleIdentifier
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme
index 0e7664a95f..c0bd8693bc 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme
@@ -88,8 +88,10 @@
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "32">
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme
index 85323bccce..954d6c42f6 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme
@@ -89,8 +89,10 @@
allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "8"
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
index 6d90be659a..438b434bda 100644
--- a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
+++ b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
@@ -88,8 +88,10 @@
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
notificationPayloadFile = "WatchApp Extension/PushNotificationPayload.apns">
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/Loop/Info.plist b/Loop/Info.plist
index 5b3a5f77ef..50b90a4d07 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Loop/View Controllers/CarbEntryViewController.swift b/Loop/View Controllers/CarbEntryViewController.swift
index 44801929fc..9c27f44e11 100644
--- a/Loop/View Controllers/CarbEntryViewController.swift
+++ b/Loop/View Controllers/CarbEntryViewController.swift
@@ -219,6 +219,11 @@ final class CarbEntryViewController: ChartsTableViewController, IdentifiableClas
cell.titleLabel.text = NSLocalizedString("Date", comment: "Title of the carb entry date picker cell")
cell.datePicker.isEnabled = isSampleEditable
cell.datePicker.datePickerMode = .dateAndTime
+ #if swift(>=5.2)
+ if #available(iOS 14.0, *) {
+ cell.datePicker.preferredDatePickerStyle = .wheels
+ }
+ #endif
cell.datePicker.maximumDate = Date(timeIntervalSinceNow: maximumDateFutureInterval)
cell.datePicker.minuteInterval = 1
cell.date = date
diff --git a/LoopCore/Info.plist b/LoopCore/Info.plist
index 1480589e68..14a2f6714c 100644
--- a/LoopCore/Info.plist
+++ b/LoopCore/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist
index 014370f7bf..256dd347c3 100644
--- a/LoopTests/Info.plist
+++ b/LoopTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleSignature
????
CFBundleVersion
diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist
index 86a8a591e9..ad12a3123e 100644
--- a/LoopUI/Info.plist
+++ b/LoopUI/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
NSPrincipalClass
diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist
index a4d6d26b2c..589b4a83c0 100644
--- a/WatchApp Extension/Info.plist
+++ b/WatchApp Extension/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleSignature
????
CFBundleVersion
diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist
index 011ed2df94..4e6268434b 100644
--- a/WatchApp/Info.plist
+++ b/WatchApp/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.2.3
+ 2.2.4
CFBundleSignature
????
CFBundleVersion