Tidepool sync (#58)

ps2 · web-flow · commit 0ea1acf171c1 · 2023-05-21T12:43:13.000-05:00
* Changes from Tidepool

* Update to dev

* Add merges for NightscoutRemoteCGM and G7SensorKit

* Fix tests

* Tidepool Merge

* Fix merge issues

* Update packages
diff --git a/AmplitudeService b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 0d9a9d9146f46263fb15fc42d16c3eadce163a7f
+Subproject commit c4345c0d794a0f870dd2ca06b14dda480b8a49b8
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit d79a794c69f743325f5920a6adc47fb3347d4f3d
+Subproject commit db09ebca405848161d5ae1355c001f05b1b7cbf2
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit eb8ccd6e336f025971eb92317d87ab0cbb41fe7e
+Subproject commit fee85e0ded0b6a2dfe7a72df1e64cbb26d428044
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 4f30d43364cea2afe951c2599b79a370029ba0e3
+Subproject commit db316ef7c46f81379742d6cc1a254be4017d1d54
diff --git a/LoopOnboarding b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 468488c7550237e7526685265f76d428b8f8ad62
+Subproject commit 292675aa0860a98517433f40e156bf695e836504
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit 9253b5ffe5acc3baab33b5ff0b22ce933bf73d0f
+Subproject commit 895f1111fe8610b4153c8ddd82077c1e60676f8b
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
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -531,6 +531,16 @@
                ReferencedContainer = "container:TidepoolService/TidepoolService.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "431CE7761F98564200255374"
+               BuildableName = "RileyLinkBLEKitTests.xctest"
+               BlueprintName = "RileyLinkBLEKitTests"
+               ReferencedContainer = "container:RileyLinkKit/RileyLinkKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/MinimedKit b/MinimedKit
@@ -1 +1 @@
-Subproject commit f55dd752e5a372a3094fc203a72a012ba1a384be
+Subproject commit 7c9ce13b1912acc4d942eaaec7c8751d8a07583a
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit 7a721de22a6bc08bd28c9c217cc4032033773877
+Subproject commit d9600e2fb2b8f424cd0fdf87dc1a6ee88f08bf66
diff --git a/RileyLinkKit b/RileyLinkKit
@@ -1 +1 @@
-Subproject commit 91d30915942c7556b7da58ab61b89a8494110308
+Subproject commit 5616a6b7d15caf293025b4ed1768be707795f4bd
diff --git a/Scripts/sync.swift b/Scripts/sync.swift
@@ -25,14 +25,13 @@ let projects = [
    Project("dexcom-share-client-swift", "dev"),
    Project("RileyLinkKit", "dev"),
    Project("NightscoutService", "dev"),
-   //Project("TrueTime.swift", "dev"),
    Project("LoopOnboarding", "dev"),
    Project("AmplitudeService", "dev"),
    Project("LogglyService", "dev"),
    Project("OmniBLE", "dev"),
    Project("NightscoutRemoteCGM", "dev"),
    Project("LoopSupport", "dev"),
-   Project("G7SensorKit", "dev"),
+   Project("G7SensorKit", "main"),
    Project("TidepoolService", "dev"),
    Project("TidepoolKit", "dev"),
    Project("OmniKit", "main"),
@@ -96,6 +95,15 @@ for project in projects {
     // Merge changes from tidepool to diy
     try await repository.merge(revisionSpecification: "\(incomingRemote)/\(project.branch)", signature: signature)
 
+    let (ahead, behind) = try repository.commitsAheadBehind(other: "origin/\(project.branch)")
+    print("Ahead = \(ahead)")
+    print("Behind = \(behind)")
+
+    guard ahead > 0 else {
+        print("No incoming changes; skipping PR creation.")
+        continue
+    }
+
     // Push changes up to origin
     let refspec = "refs/heads/" + syncBranch + ":refs/heads/" + syncBranch
     print("Pushing \(refspec) to \(project.project)")
@@ -130,7 +138,7 @@ extension Octokit {
                            draft: Bool? = nil) async throws -> PullRequest
     {
         return try await withCheckedThrowingContinuation { continuation in
-            octokit.pullRequest(owner: owner, repo: repo, title: title, head: head, headRepo: headRepo, base: base, body: body, maintainerCanModify: maintainerCanModify, draft: draft)
+            octokit.createPullRequest(owner: owner, repo: repo, title: title, head: head, headRepo: headRepo, base: base, body: body, maintainerCanModify: maintainerCanModify, draft: draft)
             { response in
                 continuation.resume(with: response)
             }
diff --git a/TidepoolKit b/TidepoolKit
@@ -1 +1 @@
-Subproject commit be3c52087abd8a11ecc1d086cff28d999198ae08
+Subproject commit 57ca696f40c09c5c69f80f1c38626550390351dd
