From 6ae9f264912734aead7a46f33b7b32acc2c3f4e8 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 5 May 2023 16:49:23 -0500 Subject: [PATCH 1/7] Changes from Tidepool --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- InfoCustomizations.txt | 1 + LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- .../contents.xcworkspacedata | 3 + MinimedKit | 2 +- NightscoutRemoteCGM | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- OmniKit | 2 +- Scripts/sync.swift | 157 ++++++++++++++++++ TidepoolKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- 19 files changed, 177 insertions(+), 16 deletions(-) create mode 100644 InfoCustomizations.txt create mode 100755 Scripts/sync.swift diff --git a/AmplitudeService b/AmplitudeService index 0d9a9d9146..d23d423ab0 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 0d9a9d9146f46263fb15fc42d16c3eadce163a7f +Subproject commit d23d423ab0b57483489ceb884185afc2c385119a diff --git a/CGMBLEKit b/CGMBLEKit index 19346b5ee9..ab02dc88e1 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 19346b5ee95bddd4c1a723c649cda6d56e8a0548 +Subproject commit ab02dc88e1e2790814e8942d037e95714875b276 diff --git a/G7SensorKit b/G7SensorKit index 3781e2ee5f..d8bbc4f47d 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 3781e2ee5f0507e8f0b2ce55384ac4a21dc078bd +Subproject commit d8bbc4f47d0a971f443f0b07681b6c5124dfd629 diff --git a/InfoCustomizations.txt b/InfoCustomizations.txt new file mode 100644 index 0000000000..dc3509c649 --- /dev/null +++ b/InfoCustomizations.txt @@ -0,0 +1 @@ +TidepoolServiceClientId=diy-loop diff --git a/LogglyService b/LogglyService index d79a794c69..99da54dbfa 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit d79a794c69f743325f5920a6adc47fb3347d4f3d +Subproject commit 99da54dbfa61c72d0c90acb07cb5ef9d36485d95 diff --git a/Loop b/Loop index 512f50df78..894e6535b3 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 512f50df78a3aa60a07bc3f2d36adc3b52971f3a +Subproject commit 894e6535b3807ef49e08f87b4139f4c6423f39e4 diff --git a/LoopKit b/LoopKit index 60f804462a..54a0154aa3 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 60f804462a45ef78d0b5939aca6c61e88f47a3bf +Subproject commit 54a0154aa330a7abc66f24dd6fb12e6a6b602f9e diff --git a/LoopOnboarding b/LoopOnboarding index 468488c755..06367ec6fd 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 468488c7550237e7526685265f76d428b8f8ad62 +Subproject commit 06367ec6fd2449f2696c5ea0d68a636887779571 diff --git a/LoopSupport b/LoopSupport index efaefcfdae..f2f26688a5 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit efaefcfdae5afadb5841275da07ab1f74deba0fb +Subproject commit f2f26688a534e2aac3605c4db1927985e884bec7 diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index b01f61dfb8..7ee2530a01 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -4,6 +4,9 @@ + + diff --git a/MinimedKit b/MinimedKit index f7b4cf5eb1..dbab9f185b 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit f7b4cf5eb1cf916b77794dce28dc03db73d26931 +Subproject commit dbab9f185b1c3938de2ca107b7190e31f31d7694 diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM index 7f5cd6b0c7..173d055f45 160000 --- a/NightscoutRemoteCGM +++ b/NightscoutRemoteCGM @@ -1 +1 @@ -Subproject commit 7f5cd6b0c792e4a1d55efb70ec638fa1232e5594 +Subproject commit 173d055f457e1540bbef13982814bbec4bd02eac diff --git a/NightscoutService b/NightscoutService index 7a721de22a..d6486eaa83 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 7a721de22a6bc08bd28c9c217cc4032033773877 +Subproject commit d6486eaa832273e77354675079aa5365468a96ae diff --git a/OmniBLE b/OmniBLE index 24063abbf6..ae4c00809a 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 24063abbf669cc26ac7b150d40c227587cc4f4d3 +Subproject commit ae4c00809ad61df66b81863e9eede907187cb9b2 diff --git a/OmniKit b/OmniKit index 8dfb5959f2..a11bb45e32 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 8dfb5959f2c9164d05e0b4e15734bb693f1fccb4 +Subproject commit a11bb45e32eaac2a20292c3aa69621614c0ec733 diff --git a/Scripts/sync.swift b/Scripts/sync.swift new file mode 100755 index 0000000000..60eb612b79 --- /dev/null +++ b/Scripts/sync.swift @@ -0,0 +1,157 @@ +#!/usr/bin/swift sh + +// Depends on swift-sh. Install with: `brew install swift-sh` + +import Foundation +import Cocoa + +import AsyncSwiftGit // @bdewey +import OctoKit // /Users/pete/dev/octokit.swift + +struct Project { + let project: String + let branch: String + + init(_ project: String, _ branch: String) { + self.project = project + self.branch = branch + } +} + +let projects = [ + Project("Loop", "dev"), + Project("LoopKit", "dev"), + Project("CGMBLEKit", "dev"), + Project("dexcom-share-client-swift", "dev"), + //Project("RileyLinkKit", "dev"), + //Project("MKRingProgressView", "dev"), + Project("NightscoutService", "dev"), + //Project("Minizip", "dev"), + //Project("TrueTime.swift", "dev"), + Project("LoopOnboarding", "dev"), + Project("AmplitudeService", "dev"), + Project("LogglyService", "dev"), + Project("OmniBLE", "dev"), + //Project("NightscoutAPIClient", "dev"), + Project("LoopSupport", "dev"), + //Project("G7SensorKit", "dev"), + Project("TidepoolService", "dev"), + Project("TidepoolKit", "dev"), + Project("OmniKit", "main"), + Project("MinimedKit", "main") +] + +let fm = FileManager.default +let loopkit = URL(string: "https://github.com/LoopKit")! +let tidepool = URL(string: "https://github.com/tidepool-org")! +let syncBranch = "tidepool-sync" +let incomingRemote = "tidepool" + +enum EnvError: Error { + case missing(String) +} + +func getEnv(_ name: String) throws -> String { + guard let value = ProcessInfo.processInfo.environment[name] else { + throw EnvError.missing(name) + } + return value +} + +let ghUsername = try getEnv("GH_USERNAME") +let ghToken = try getEnv("GH_TOKEN") +let ghCommitterName = try getEnv("GH_COMMITTER_NAME") +let ghCommitterEmail = try getEnv("GH_COMMITTER_EMAIL") + +let octokit = Octokit(TokenConfiguration(ghToken)) + +let credentials = Credentials.plaintext(username: ghUsername, password: ghToken) +let signature = try! Signature(name: ghCommitterName, email: ghCommitterEmail) + +for project in projects { + let dest = URL(string: fm.currentDirectoryPath)!.appendingPathComponent(project.project) + let repository: AsyncSwiftGit.Repository + if !fm.fileExists(atPath: project.project) { + print("Cloning \(project.project)") + let url = loopkit.appendingPathComponent(project.project) + repository = try await Repository.clone(from: url, to: dest) + print("Cloned \(project.project)") + } else { + print("Already Exists: \(project.project)") + repository = try Repository(openAt: dest) + } + + let incomingRemoteURL = tidepool.appendingPathComponent(project.project) + + // Add remote if it doesn't exist, and fetch latest changes + if (try? repository.remoteURL(for: incomingRemote)) == nil { + try repository.addRemote(incomingRemote, url: incomingRemoteURL) + } + try await repository.fetch(remote: incomingRemote) + + // Create and checkout the branch where sync changesets will go ("tidepool-sync") + if !(try repository.branchExists(named: syncBranch)) { + try repository.createBranch(named: syncBranch, target: project.branch) + } + try await repository.checkout(revspec: syncBranch) + + // Merge changes from tidepool to diy + try await repository.merge(revisionSpecification: "\(incomingRemote)/\(project.branch)", signature: signature) + + // Push changes up to origin + let refspec = "refs/heads/" + syncBranch + ":refs/heads/" + syncBranch + print("Pushing \(refspec) to \(project.project)") + try await repository.push(remoteName: "origin", refspecs: [refspec], credentials: credentials) + + // Make sure a PR exists, or create it + let prs = try await octokit.listPullRequests(owner: "LoopKit", repo: project.project, base: project.branch, head:"LoopKit:tidepool-sync") + let pr: PullRequest + if prs.count == 0 { + pr = try await octokit.createPullRequest(owner: "LoopKit", repo: project.project, title: "Tidepool Sync", head: "LoopKit:" + syncBranch, base: project.branch, body: "") + print("PR = \(pr)") + } else { + pr = prs.first! + } + if let url = pr.htmlURL { + if NSWorkspace.shared.open(url) { + print("default browser was successfully opened") + + } + } +} + +extension Octokit { + func createPullRequest(owner: String, + repo: String, + title: String, + head: String, + headRepo: String? = nil, + base: String, + body: String? = nil, + maintainerCanModify: Bool? = nil, + 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) + { response in + continuation.resume(with: response) + } + } + } + + func listPullRequests(owner: String, + repo: String, + base: String? = nil, + head: String? = nil, + state: Openness = .open, + sort: SortType = .created, + direction: SortDirection = .desc) async throws -> [PullRequest] + { + return try await withCheckedThrowingContinuation { continuation in + octokit.pullRequests(owner: owner, repository: repo, base: base, head: head, state: state, sort: sort, direction: direction) + { response in + continuation.resume(with: response) + } + } + } +} diff --git a/TidepoolKit b/TidepoolKit index 569b436a01..2caa5de3ea 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 569b436a01bcafc43a6d6bec7a5fa9b25147974c +Subproject commit 2caa5de3eaa80e632625928cd3b037a1a74e5f36 diff --git a/TidepoolService b/TidepoolService index 0eef224636..810a13811f 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 0eef2246365d981ef8fa4b5f45bb606a74875de0 +Subproject commit 810a13811f024eb8ab2d183e5032ead9283b9bff diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 20ed7a1457..ad9e85abe2 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 20ed7a1457af2e5a72fcc1c91b660ae8c0478d94 +Subproject commit ad9e85abe2e87e131552e00e36b3b3f1590855c6 From 05bce6c701395eb168a9a7c28cc204796c93941f Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 6 May 2023 10:27:44 -0500 Subject: [PATCH 2/7] Update to dev --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- MinimedKit | 2 +- NightscoutRemoteCGM | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- Scripts/update_submodule_refs.sh | 2 +- TidepoolKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index d23d423ab0..0d9a9d9146 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit d23d423ab0b57483489ceb884185afc2c385119a +Subproject commit 0d9a9d9146f46263fb15fc42d16c3eadce163a7f diff --git a/CGMBLEKit b/CGMBLEKit index ab02dc88e1..69d3e4f8e8 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit ab02dc88e1e2790814e8942d037e95714875b276 +Subproject commit 69d3e4f8e82583c83fff40152ab551cfe4989728 diff --git a/G7SensorKit b/G7SensorKit index d8bbc4f47d..3781e2ee5f 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit d8bbc4f47d0a971f443f0b07681b6c5124dfd629 +Subproject commit 3781e2ee5f0507e8f0b2ce55384ac4a21dc078bd diff --git a/LogglyService b/LogglyService index 99da54dbfa..d79a794c69 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 99da54dbfa61c72d0c90acb07cb5ef9d36485d95 +Subproject commit d79a794c69f743325f5920a6adc47fb3347d4f3d diff --git a/Loop b/Loop index 894e6535b3..3d1e99fc59 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 894e6535b3807ef49e08f87b4139f4c6423f39e4 +Subproject commit 3d1e99fc591d0e5db52c8e7313c5a3b3aff3bba4 diff --git a/LoopKit b/LoopKit index 54a0154aa3..a78aa8ed92 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 54a0154aa330a7abc66f24dd6fb12e6a6b602f9e +Subproject commit a78aa8ed92f9248c22acefbdd7a54d5cf7da9e6e diff --git a/LoopOnboarding b/LoopOnboarding index 06367ec6fd..468488c755 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 06367ec6fd2449f2696c5ea0d68a636887779571 +Subproject commit 468488c7550237e7526685265f76d428b8f8ad62 diff --git a/LoopSupport b/LoopSupport index f2f26688a5..9253b5ffe5 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit f2f26688a534e2aac3605c4db1927985e884bec7 +Subproject commit 9253b5ffe5acc3baab33b5ff0b22ce933bf73d0f diff --git a/MinimedKit b/MinimedKit index dbab9f185b..cbcd116603 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit dbab9f185b1c3938de2ca107b7190e31f31d7694 +Subproject commit cbcd116603ec0022e35048bf95f68af9ce5287ea diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM index 173d055f45..7f5cd6b0c7 160000 --- a/NightscoutRemoteCGM +++ b/NightscoutRemoteCGM @@ -1 +1 @@ -Subproject commit 173d055f457e1540bbef13982814bbec4bd02eac +Subproject commit 7f5cd6b0c792e4a1d55efb70ec638fa1232e5594 diff --git a/NightscoutService b/NightscoutService index d6486eaa83..7a721de22a 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit d6486eaa832273e77354675079aa5365468a96ae +Subproject commit 7a721de22a6bc08bd28c9c217cc4032033773877 diff --git a/OmniBLE b/OmniBLE index ae4c00809a..be85ec630e 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit ae4c00809ad61df66b81863e9eede907187cb9b2 +Subproject commit be85ec630e40b8fb8ee76cfca63c4a73617db6d7 diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh index fe24d7f015..5ad5c71945 100755 --- 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:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios: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) for project in ${projects}; do echo "Updating to $project" diff --git a/TidepoolKit b/TidepoolKit index 2caa5de3ea..569b436a01 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 2caa5de3eaa80e632625928cd3b037a1a74e5f36 +Subproject commit 569b436a01bcafc43a6d6bec7a5fa9b25147974c diff --git a/TidepoolService b/TidepoolService index 810a13811f..3cad23b954 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 810a13811f024eb8ab2d183e5032ead9283b9bff +Subproject commit 3cad23b9547f5a6cd2aa8b0e27800ac36d87d9b6 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index ad9e85abe2..792c0b5d61 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit ad9e85abe2e87e131552e00e36b3b3f1590855c6 +Subproject commit 792c0b5d61a071e699b9773d2f86f39f10ebffd5 From 5177d28537dcabbefa48c933488d8744f2a803b3 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 6 May 2023 10:34:37 -0500 Subject: [PATCH 3/7] Add merges for NightscoutRemoteCGM and G7SensorKit --- G7SensorKit | 2 +- NightscoutRemoteCGM | 2 +- Scripts/sync.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/G7SensorKit b/G7SensorKit index 3781e2ee5f..eda0394169 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 3781e2ee5f0507e8f0b2ce55384ac4a21dc078bd +Subproject commit eda0394169ea3a3c8781658946c00270559bc64b diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM index 7f5cd6b0c7..cc3e21508c 160000 --- a/NightscoutRemoteCGM +++ b/NightscoutRemoteCGM @@ -1 +1 @@ -Subproject commit 7f5cd6b0c792e4a1d55efb70ec638fa1232e5594 +Subproject commit cc3e21508c0c3c6ef52d0a986ae4bb863b8d2078 diff --git a/Scripts/sync.swift b/Scripts/sync.swift index 60eb612b79..899ad0a6b1 100755 --- a/Scripts/sync.swift +++ b/Scripts/sync.swift @@ -32,9 +32,9 @@ let projects = [ Project("AmplitudeService", "dev"), Project("LogglyService", "dev"), Project("OmniBLE", "dev"), - //Project("NightscoutAPIClient", "dev"), + Project("NightscoutRemoteCGM", "dev"), Project("LoopSupport", "dev"), - //Project("G7SensorKit", "dev"), + Project("G7SensorKit", "dev"), Project("TidepoolService", "dev"), Project("TidepoolKit", "dev"), Project("OmniKit", "main"), From aeebec49169f406f4295d663b7e4c577a2102de3 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 6 May 2023 10:51:41 -0500 Subject: [PATCH 4/7] Fix tests --- MinimedKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MinimedKit b/MinimedKit index cbcd116603..35204a6297 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit cbcd116603ec0022e35048bf95f68af9ce5287ea +Subproject commit 35204a6297238ecd34ba872740d575e3c95dd0b2 From 2a2ed0e585eca6c2f8e1ce6e1b285a64b0341192 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 21 May 2023 12:00:18 -0500 Subject: [PATCH 5/7] Tidepool Merge --- .gitmodules | 3 --- AmplitudeService | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- .../contents.xcworkspacedata | 19 ++++++++++++++++--- .../xcshareddata/swiftpm/Package.resolved | 18 ++++++++++++++++++ .../xcschemes/LoopWorkspace.xcscheme | 10 ++++++++++ MKRingProgressView | 1 - MinimedKit | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- OmniKit | 2 +- RileyLinkKit | 2 +- Scripts/sync.swift | 18 ++++++++++++------ TidepoolKit | 2 +- 18 files changed, 68 insertions(+), 25 deletions(-) delete mode 160000 MKRingProgressView diff --git a/.gitmodules b/.gitmodules index b6d5b7b5df..12afa2e72b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "RileyLinkKit"] path = RileyLinkKit url = https://github.com/LoopKit/RileyLinkKit -[submodule "MKRingProgressView"] - path = MKRingProgressView - url = https://github.com/LoopKit/MKRingProgressView.git [submodule "NightscoutService"] path = NightscoutService url = https://github.com/LoopKit/NightscoutService.git diff --git a/AmplitudeService b/AmplitudeService index 0d9a9d9146..c4345c0d79 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 0d9a9d9146f46263fb15fc42d16c3eadce163a7f +Subproject commit c4345c0d794a0f870dd2ca06b14dda480b8a49b8 diff --git a/LogglyService b/LogglyService index d79a794c69..db09ebca40 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit d79a794c69f743325f5920a6adc47fb3347d4f3d +Subproject commit db09ebca405848161d5ae1355c001f05b1b7cbf2 diff --git a/Loop b/Loop index 3d1e99fc59..fee85e0ded 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 3d1e99fc591d0e5db52c8e7313c5a3b3aff3bba4 +Subproject commit fee85e0ded0b6a2dfe7a72df1e64cbb26d428044 diff --git a/LoopKit b/LoopKit index a78aa8ed92..db316ef7c4 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit a78aa8ed92f9248c22acefbdd7a54d5cf7da9e6e +Subproject commit db316ef7c46f81379742d6cc1a254be4017d1d54 diff --git a/LoopOnboarding b/LoopOnboarding index 468488c755..292675aa08 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 468488c7550237e7526685265f76d428b8f8ad62 +Subproject commit 292675aa0860a98517433f40e156bf695e836504 diff --git a/LoopSupport b/LoopSupport index 9253b5ffe5..895f1111fe 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 9253b5ffe5acc3baab33b5ff0b22ce933bf73d0f +Subproject commit 895f1111fe8610b4153c8ddd82077c1e60676f8b diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 7ee2530a01..39d6f5016d 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -4,6 +4,9 @@ + + @@ -17,6 +20,19 @@ + + + + + + + + @@ -53,9 +69,6 @@ - - diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index a661631a27..e73102b2ca 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -45,6 +45,15 @@ "version" : "1.7.0" } }, + { + "identity" : "mkringprogressview", + "kind" : "remoteSourceControl", + "location" : "https://github.com/maxkonovalov/MKRingProgressView.git", + "state" : { + "branch" : "master", + "revision" : "660888aab1d2ab0ed7eb9eb53caec12af4955fa7" + } + }, { "identity" : "nightscoutkit", "kind" : "remoteSourceControl", @@ -70,6 +79,15 @@ "branch" : "master", "revision" : "c354c1945bb35a1f01b665b22474f6db28cba4a2" } + }, + { + "identity" : "zipfoundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/LoopKit/ZIPFoundation.git", + "state" : { + "branch" : "stream-entry", + "revision" : "91700d5f888090e88589f7c8d97e78417793e78e" + } } ], "version" : 2 diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index b4acf645ad..048930097f 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -559,6 +559,16 @@ ReferencedContainer = "container:TidepoolService/TidepoolService.xcodeproj"> + + + + 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)") @@ -132,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 index 569b436a01..57ca696f40 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 569b436a01bcafc43a6d6bec7a5fa9b25147974c +Subproject commit 57ca696f40c09c5c69f80f1c38626550390351dd From bacab93700b3332e4231ad036026335366422b2f Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 21 May 2023 12:16:23 -0500 Subject: [PATCH 6/7] Fix merge issues --- LoopWorkspace.xcworkspace/contents.xcworkspacedata | 6 ------ .../xcshareddata/swiftpm/Package.resolved | 13 ++----------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index d252d9bc1e..eaa82dac0c 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -70,12 +70,6 @@ location = "group:NightscoutService/NightscoutService.xcodeproj"> - - >>>>>> origin/dev location = "group:TrueTime.swift/TrueTime.xcodeproj"> Date: Sun, 21 May 2023 12:22:26 -0500 Subject: [PATCH 7/7] Update packages --- .../xcshareddata/swiftpm/Package.resolved | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index e73102b2ca..7f0215698d 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/amplitude/Amplitude-iOS.git", "state" : { "branch" : "main", - "revision" : "8e1239c369e0dfe4c26f2dce1b05d093f6e18aff" + "revision" : "e818b182f5c3d5ce5035deab90bca108175b3561" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/openid/AppAuth-iOS", "state" : { - "revision" : "0eadcdec4ddb121865f3d66917549194afce1f2b", - "version" : "1.6.1" + "revision" : "71cde449f13d453227e687458144bde372d30fc7", + "version" : "1.6.2" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/krzyzanowskim/CryptoSwift", "state" : { - "revision" : "95c18f1c1bc44d5547728621ed680850368f7a45", - "version" : "1.7.0" + "revision" : "eee9ad754926c40a0f7e73f152357d37b119b7fa", + "version" : "1.7.1" } }, {