Tidepool merge (LoopKit#65)

ps2 · web-flow · commit 614c9e9f2a5f · 2023-07-10T12:25:29.000-05:00
* Removing TidepoolKit

* Removing TidepoolKit

* Update submodules
diff --git a/.gitmodules b/.gitmodules
@@ -46,9 +46,6 @@
 [submodule "TidepoolService"]
 	path = TidepoolService
 	url = https://github.com/LoopKit/TidepoolService.git
-[submodule "TidepoolKit"]
-	path = TidepoolKit
-	url = https://github.com/LoopKit/TidepoolKit.git
 [submodule "OmniKit"]
 	path = OmniKit
 	url = https://github.com/LoopKit/OmniKit.git
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit db09ebca405848161d5ae1355c001f05b1b7cbf2
+Subproject commit 94b5ba1691d49130966455725e447e4070ae885e
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit fa03121bba4b7c0a473e7f0f677fed2d4119d513
+Subproject commit b4a5567892bd47c0524d80efe26aead326f82cde
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 76d329445c8cfa97da13463581e367f5f04874ab
+Subproject commit 26ab8f752a0c243bd861a3be8f8bd2702b14f490
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -71,6 +71,15 @@
         "revision" : "c354c1945bb35a1f01b665b22474f6db28cba4a2"
       }
     },
+    {
+      "identity" : "tidepoolkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tidepool-org/TidepoolKit",
+      "state" : {
+        "branch" : "dev",
+        "revision" : "a0bcbb037789fcd186e151c7eaf36aa1b9632915"
+      }
+    },
     {
       "identity" : "zipfoundation",
       "kind" : "remoteSourceControl",
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit a835bb9c0a774919e622bf3617735fd8dd496c45
+Subproject commit bd3cfdc4799a659c81e10fba49701ba2e32e8883
diff --git a/Scripts/sync.swift b/Scripts/sync.swift
@@ -101,6 +101,7 @@ for project in projects {
 
     guard ahead > 0 else {
         print("No incoming changes; skipping PR creation.")
+	try await repository.checkout(revspec: project.branch)
         continue
     }
 
diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutRemoteCGM:dev LoopKit:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:RileyLinkKit:dev LoopKit:OmniKit:main LoopKit:MinimedKit:main)
+projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutRemoteCGM:dev LoopKit:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:RileyLinkKit:dev LoopKit:OmniKit:main LoopKit:MinimedKit:main LoopKit:LibreTransmitter:main)
 
 for project in ${projects}; do
   echo "Updating to $project"
diff --git a/TidepoolKit b/TidepoolKit
diff --git a/TidepoolService b/TidepoolService
@@ -1 +1 @@
-Subproject commit 7a8a1962e7be0d9e6fc237f2c3f20acc731b0659
+Subproject commit 28e647630438b52380cbfa41bd301d0a6252c235

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ for project in projects {`
`101`	`101`
`102`	`102`	`guard ahead > 0 else {`
`103`	`103`	`print("No incoming changes; skipping PR creation.")`
	`104`	`+ try await repository.checkout(revspec: project.branch)`
`104`	`105`	`continue`
`105`	`106`	`}`
`106`	`107`