LoopKit · ps2 · Oct 27, 2024 · Oct 27, 2024 · Oct 28, 2024 · Oct 28, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,18 +1,18 @@
 jobs:
   build_and_test:
     macos:
-      xcode: 15.4.0
+      xcode: 16.0
     steps:
       - checkout
       - run:
           name: Checkout submodules
           command: git submodule update --init --recursive --depth 1
       - run:
           name: Build Loop
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' build | xcpretty
+          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'name=iPhone 16' build | xcpretty
       - run:
           name: Run Tests
-          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' test | xcpretty
+          command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'name=iPhone 16' test | xcpretty
 workflows:
   version: 2
   build_and_test:

diff --git a/AmplitudeService b/AmplitudeService
diff --git a/CGMBLEKit b/CGMBLEKit
diff --git a/G7SensorKit b/G7SensorKit
diff --git a/LibreTransmitter b/LibreTransmitter
diff --git a/LogglyService b/LogglyService
diff --git a/Loop b/Loop
diff --git a/LoopKit b/LoopKit
diff --git a/LoopOnboarding b/LoopOnboarding
diff --git a/LoopSupport b/LoopSupport
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/MinimedKit b/MinimedKit
diff --git a/MixpanelService b/MixpanelService
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
diff --git a/NightscoutService b/NightscoutService
diff --git a/OmniBLE b/OmniBLE
diff --git a/OmniKit b/OmniKit
diff --git a/Scripts/sync.swift b/Scripts/sync.swift
@@ -112,6 +112,7 @@ for project in projects {
     try await repository.checkout(revspec: syncBranch)
 
     // Merge changes from tidepool to diy
+    print("Starting merge for \(project.project)")
     try await repository.merge(revisionSpecification: "\(incomingRemote)/\(project.branch)", signature: signature)
 
     let originTree = try repository.lookupTree(for: "origin/\(project.branch)")

diff --git a/TidepoolService b/TidepoolService
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
+4 −4		AmplitudeService.xcodeproj/project.pbxproj
+1 −1		AmplitudeServiceKit/AmplitudeService.swift
+2 −2		AmplitudeServiceKitUI/AmplitudeService+UI.swift
+1 −0		CGMBLEKit/Glucose+SensorDisplayable.swift
+2 −2		CGMBLEKit/TransmitterManager.swift
+4 −0		G7SensorKit.xcodeproj/project.pbxproj
+1 −0		G7SensorKit/G7CGMManager/G7BackfillMessage.swift
+1 −1		G7SensorKit/G7CGMManager/G7CGMManager.swift
+1 −0		G7SensorKit/Messages/G7GlucoseMessage.swift
+2 −0		LibreDemoPlugin/LibreDemoCGMManager.swift
+4 −4		LibreTransmitter.xcodeproj/project.pbxproj
+1 −0		LibreTransmitter/LibreGlucose.swift
+1 −1		LibreTransmitter/LibreTransmitterManagerV3.swift
+1 −1		LogglyServiceKit/LogglyService.swift
+2 −2		LogglyServiceKitUI/LogglyService+UI.swift
+3 −2		LoopOnboardingKitUI/LoopOnboardingUI.swift
+16 −16		LoopOnboardingKitUI/View Controllers/OnboardingUICoordinator.swift
+3 −0		LoopOnboardingKitUI/Views/WelcomeView.swift
+1 −1		MinimedKit/PumpManager/EnliteSensorDisplayable.swift
+10 −6		MinimedKit/PumpManager/MinimedPumpManager.swift
+1 −1		MinimedKitUI/MinimedHUDProvider.swift
+5 −5		MinimedKitUI/Views/MinimedPumpSettingsViewModel.swift
+6 −6		MixpanelService.xcodeproj/project.pbxproj
+1 −1		MixpanelServiceKit/MixpanelService.swift
+2 −2		MixpanelServiceKitUI/MixpanelService+UI.swift
+1 −0		NightscoutRemoteCGM/NightscoutFetcher.swift
+1 −1		NightscoutRemoteCGM/NightscoutRemoteCGM.swift
+2 −2		NightscoutServiceKit/Extensions/StoredSettings.swift
+135 −109		NightscoutServiceKit/NightscoutService.swift
+2 −2		NightscoutServiceKitUI/NightscoutService+UI.swift