Tidepool Merge

ps2 · ps2 · commit 06944a2a8d49 · 2024-10-27T12:58:42.000-05:00
diff --git a/AmplitudeService b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 98f9759b17e8716c65257c24a652564ead3c5183
+Subproject commit f75f64f25b399b9e9a007a01a71a592875b948a8
diff --git a/CGMBLEKit b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 4adef2662060f7d11d1abd8d099c3e022bf00cef
+Subproject commit 5f1991f260808e87dd180d0af38f67c54a0d1dfc
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 2be3eb29b0a18aa89f8b60281341e46e07d024e5
+Subproject commit 8458d602d555c0996d67c440b056573992859ad9
diff --git a/LibreTransmitter b/LibreTransmitter
@@ -1 +1 @@
-Subproject commit c01eba63e94e9f6f2841a8835680c4e39c61b18d
+Subproject commit 995bef901481ff9d1ff9abfd1fee19539719bd02
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit 1bb8223748003e51770875200489cce83f74c570
+Subproject commit 2ef148d898d7af249598c1e238ff01985f3ed7c2
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit 1aaee2db4953dbcdbe71a15cad967dbb190dc238
+Subproject commit 95901af7f45703dcfbb8b16c879d9873c9c401e8
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 3ce43ded238a776f7c8a8a9bea339db47adc0c20
+Subproject commit 6310fb13ad24d1dbdb7d7a029d5ba2b73cb701c1
diff --git a/LoopOnboarding b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 4c5c1927999ae5dd3861e67ca9f10c14a59d1cc6
+Subproject commit 3305ec45a0fb702ffc5cd75c0cfd5831d0aaff99
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit 4728c67836e6a60118fcf6cc262010e9b3d14e68
+Subproject commit 7bfdeda786adc5c985dbc3ae061ebd8b245916be
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f8d1e9c237647ab612da7f2bd3ae26946f39410508314c00cf54509a673f147e",
+  "originHash" : "1082d4ca5948c4d25085bad8b89b58cf4e0c25583a64f6b79c3320b7c7bb777b",
   "pins" : [
     {
       "identity" : "amplitude-ios",
@@ -37,6 +37,15 @@
         "version" : "1.7.1"
       }
     },
+    {
+      "identity" : "loopalgorithm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tidepool-org/LoopAlgorithm",
+      "state" : {
+        "branch" : "main",
+        "revision" : "c4455e105d268757d6c304728e2b7638af7e6c53"
+      }
+    },
     {
       "identity" : "mixpanel-swift",
       "kind" : "remoteSourceControl",
@@ -96,15 +105,14 @@
       "location" : "https://github.com/tidepool-org/TidepoolKit",
       "state" : {
         "branch" : "dev",
-        "revision" : "54045c2e7d720dcd8a0909037772dcd6f54f0158"
+        "revision" : "b21a7906a202525c4e303dbee9b92182927ef0b5"
       }
     },
     {
       "identity" : "zipfoundation",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/LoopKit/ZIPFoundation.git",
       "state" : {
-        "branch" : "stream-entry",
         "revision" : "c67b7509ec82ee2b4b0ab3f97742b94ed9692494"
       }
     }
diff --git a/MinimedKit b/MinimedKit
@@ -1 +1 @@
-Subproject commit a079b53119594b37436043859f0fe0a0754724e2
+Subproject commit 1c0b30187a067b2c53629084ec8d5215d802570b
diff --git a/MixpanelService b/MixpanelService
@@ -1 +1 @@
-Subproject commit b33debdac37d6ef3be955eebb0c42495a1f19232
+Subproject commit 439e9d0a1e6c5a81a2b3f4e4e862f0fdf39cb4de
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
@@ -1 +1 @@
-Subproject commit 3b220185d0bea9f5f49c2d8d99db95cfe4c636c0
+Subproject commit 6e014e1737ba6ff48d468d9a07f33526a91b3399
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit d839b66054623c213ba79c57540f00e08fad81c3
+Subproject commit f6a1d6e4aece02639967954b404d395a566b533a
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit b82d2e1fff5f0fccc42145fcbbe4731b80898fff
+Subproject commit 3930aa8d9691fa50070560cd3d33ef7fac8c3093
diff --git a/OmniKit b/OmniKit
@@ -1 +1 @@
-Subproject commit 3a75484ba062f647e9c5ff0291948859c77ba9b2
+Subproject commit 2ab9c8e5f9df7a300c3d44f16dac910510e0ccfd
diff --git a/RileyLinkKit b/RileyLinkKit
@@ -1 +1 @@
-Subproject commit a0e419da314d0ad42b41ccb04af73cd1fbf41257
+Subproject commit 9dbf381ace7d563daf93a6f378151ce350d4f031
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
@@ -1 +1 @@
-Subproject commit 6e007cbde9920a9d8f25ae855deb36f989a2ce0f
+Subproject commit dae116935c0adb41105f3851c2a84c2d9cee579c
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit 21d8657d727f26df76342188e580022bf4884714
+Subproject commit e012b3403cfd8a8f8b7bbb2ff063e9f870c9c8bc

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "originHash" : "f8d1e9c237647ab612da7f2bd3ae26946f39410508314c00cf54509a673f147e",`
	`2`	`+ "originHash" : "1082d4ca5948c4d25085bad8b89b58cf4e0c25583a64f6b79c3320b7c7bb777b",`
`3`	`3`	`"pins" : [`
`4`	`4`	`{`
`5`	`5`	`"identity" : "amplitude-ios",`
`@@ -37,6 +37,15 @@`
`37`	`37`	`"version" : "1.7.1"`
`38`	`38`	`}`
`39`	`39`	`},`
	`40`	`+ {`
	`41`	`+ "identity" : "loopalgorithm",`
	`42`	`+ "kind" : "remoteSourceControl",`
	`43`	`+ "location" : "https://github.com/tidepool-org/LoopAlgorithm",`
	`44`	`+ "state" : {`
	`45`	`+ "branch" : "main",`
	`46`	`+ "revision" : "c4455e105d268757d6c304728e2b7638af7e6c53"`
	`47`	`+ }`
	`48`	`+ },`
`40`	`49`	`{`
`41`	`50`	`"identity" : "mixpanel-swift",`
`42`	`51`	`"kind" : "remoteSourceControl",`
`@@ -96,15 +105,14 @@`
`96`	`105`	`"location" : "https://github.com/tidepool-org/TidepoolKit",`
`97`	`106`	`"state" : {`
`98`	`107`	`"branch" : "dev",`
`99`		`- "revision" : "54045c2e7d720dcd8a0909037772dcd6f54f0158"`
	`108`	`+ "revision" : "b21a7906a202525c4e303dbee9b92182927ef0b5"`
`100`	`109`	`}`
`101`	`110`	`},`
`102`	`111`	`{`
`103`	`112`	`"identity" : "zipfoundation",`
`104`	`113`	`"kind" : "remoteSourceControl",`
`105`	`114`	`"location" : "https://github.com/LoopKit/ZIPFoundation.git",`
`106`	`115`	`"state" : {`
`107`		`- "branch" : "stream-entry",`
`108`	`116`	`"revision" : "c67b7509ec82ee2b4b0ab3f97742b94ed9692494"`
`109`	`117`	`}`
`110`	`118`	`}`