Update to all the recent submodule merges and fixes

CatharinaKU · Apr 3, 2022 · 5afebb6 · 5afebb6
1 parent 81a4dd5
commit 5afebb6
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/Amplitude-iOS b/Amplitude-iOS
diff --git a/AmplitudeService b/AmplitudeService
diff --git a/CGMBLEKit b/CGMBLEKit
diff --git a/LogglyService b/LogglyService
diff --git a/Loop b/Loop
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig
@@ -4,7 +4,7 @@
 // MAIN_APP_BUNDLE_IDENTIFIER = com.myname.loop
 
 // Customize this to change the app name displayed
-MAIN_APP_DISPLAY_NAME = Loop
+//MAIN_APP_DISPLAY_NAME = Loop
 
 // Features
 SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) ALLOW_SIMULATORS_ENABLED //ALLOW_DEBUG_FEATURES_ENABLED

diff --git a/LoopKit b/LoopKit
diff --git a/LoopOnboarding b/LoopOnboarding
diff --git a/Minizip b/Minizip
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
diff --git a/NightscoutService b/NightscoutService
diff --git a/OmniBLE b/OmniBLE
diff --git a/SwiftCharts b/SwiftCharts
diff --git a/TrueTime.swift b/TrueTime.swift
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
diff --git a/rileylink_ios b/rileylink_ios
+17 −27		Amplitude.xcodeproj/project.pbxproj
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude.xcscheme
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude_iOS.xcscheme
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude_iOSTests.xcscheme
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude_macOS.xcscheme
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude_tvOS.xcscheme
+1 −1		Amplitude.xcodeproj/xcshareddata/xcschemes/Amplitude_watchOS.xcscheme
+0 −3		Framework/AmplitudeFramework.h
+3 −3		Sources/Amplitude/Public/Amplitude.h
+12 −8		AmplitudeService.xcodeproj/project.pbxproj
+10 −14		AmplitudeService.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+1 −1		AmplitudeServiceKitUI/IdentifiableClass.swift
+21 −67		CGMBLEKit.xcodeproj/project.pbxproj
+10 −14		CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit Example.xcscheme
+3 −7		CGMBLEKit.xcodeproj/xcshareddata/xcschemes/ResetTransmitter.xcscheme
+1 −5		CGMBLEKit.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme
+1 −1		CGMBLEKit.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+1 −1		CGMBLEKit/Info.plist
+1 −1		CGMBLEKitUI/IdentifiableClass.swift
+1 −1		CGMBLEKitUI/TransmitterSetupViewController.swift
+2 −8		LogglyService.xcodeproj/project.pbxproj
+1 −1		LogglyService.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+10 −14		Loop.xcodeproj/project.pbxproj
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/Cartfile.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/Learn.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/Loop Intent Extension.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
+1 −1		Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
+2 −2		Loop/Managers/LoopDataManager.swift
+9 −19		Loop/View Models/ManualEntryDoseViewModel.swift
+8 −2		Loop/Views/ManualEntryDoseView.swift
+8 −18		LoopKit.xcodeproj/project.pbxproj
+1 −1		LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme
+1 −1		LoopKit.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme
+1 −1		LoopKit.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+14 −10		LoopKitUI/Views/ExpandablePicker.swift
+1 −17		MockKit/MockCGMManager.swift
+4 −8		LoopOnboarding.xcodeproj/project.pbxproj
+1 −1		LoopOnboarding.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+1 −1		Minizip.xcodeproj/xcshareddata/xcschemes/Minizip-OSX.xcscheme
+1 −1		Minizip.xcodeproj/xcshareddata/xcschemes/Minizip-iOS.xcscheme
+1 −1		Minizip.xcodeproj/xcshareddata/xcschemes/Minizip-tvOS.xcscheme
+1 −1		Minizip.xcodeproj/xcshareddata/xcschemes/Minizip-watchOS.xcscheme
+1 −1		NightscoutService.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+5 −1		NightscoutServiceKit/Extensions/HKUnit.swift
+1 −1		NightscoutServiceKit/Extensions/NightscoutUploader.swift
+24 −6		NightscoutServiceKit/Extensions/StoredGlucoseSample.swift
+1 −1		NightscoutServiceKitUI/Extensions/IdentifiableClass.swift
+7 −5		OmniBLE.xcodeproj/project.pbxproj
+1 −1		OmniBLE.xcodeproj/xcshareddata/xcschemes/OmniBLETests.xcscheme
+6 −0		OmniBLE/OmnipodCommon/MessageBlocks/AcknowledgeAlertCommand.swift
+6 −5		OmniBLE/PumpManager/OmniBLEPumpManager.swift
+30 −3		OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift
+3 −3		OmniBLE/PumpManagerUI/ViewModels/PairPodViewModel.swift
+2 −0		OmniBLE/PumpManagerUI/Views/OmniBLESettingsView.swift