From cf7ddc0096bef433834665f9f14ebcba3ed4a4d7 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 10 Jul 2023 11:35:44 -0500 Subject: [PATCH 1/3] Removing TidepoolKit --- .gitmodules | 3 --- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopWorkspace.xcworkspace/contents.xcworkspacedata | 3 --- .../xcshareddata/swiftpm/Package.resolved | 9 +++++++++ OmniBLE | 2 +- Scripts/sync.swift | 1 + Scripts/update_submodule_refs.sh | 2 +- TidepoolKit | 2 +- TidepoolService | 2 +- 11 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9a222dcccc..f1c6c8c910 100644 --- 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 index db09ebca40..99da54dbfa 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit db09ebca405848161d5ae1355c001f05b1b7cbf2 +Subproject commit 99da54dbfa61c72d0c90acb07cb5ef9d36485d95 diff --git a/Loop b/Loop index fa03121bba..6f3a067077 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit fa03121bba4b7c0a473e7f0f677fed2d4119d513 +Subproject commit 6f3a0670775012627b6549ce825081eb44cc7b48 diff --git a/LoopKit b/LoopKit index 76d329445c..26ab8f752a 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 76d329445c8cfa97da13463581e367f5f04874ab +Subproject commit 26ab8f752a0c243bd861a3be8f8bd2702b14f490 diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index c5b3b88deb..6fc4383956 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -73,9 +73,6 @@ - - diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index de2f4c0e78..328a7401c2 100644 --- 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 index a835bb9c0a..bd3cfdc479 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit a835bb9c0a774919e622bf3617735fd8dd496c45 +Subproject commit bd3cfdc4799a659c81e10fba49701ba2e32e8883 diff --git a/Scripts/sync.swift b/Scripts/sync.swift index 27d3f6f23c..af3f97e1ed 100755 --- 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 index 5ad5c71945..e09a8a30c2 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: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 index d3a260ac66..e958cc2925 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit d3a260ac66d0a149f28fa375f93820c0cdbc18f5 +Subproject commit e958cc292585665fb1bdf38a58408113ff6dde29 diff --git a/TidepoolService b/TidepoolService index 7a8a1962e7..28e6476304 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 7a8a1962e7be0d9e6fc237f2c3f20acc731b0659 +Subproject commit 28e647630438b52380cbfa41bd301d0a6252c235 From 8cb50538c0602507761c91a1867c6680f8c71f3a Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 10 Jul 2023 11:35:56 -0500 Subject: [PATCH 2/3] Removing TidepoolKit --- TidepoolKit | 1 - 1 file changed, 1 deletion(-) delete mode 160000 TidepoolKit diff --git a/TidepoolKit b/TidepoolKit deleted file mode 160000 index e958cc2925..0000000000 --- a/TidepoolKit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e958cc292585665fb1bdf38a58408113ff6dde29 From 561a4cf6332023befcf5ee74c5d3f1674521e840 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 10 Jul 2023 11:42:04 -0500 Subject: [PATCH 3/3] Update submodules --- LogglyService | 2 +- Loop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LogglyService b/LogglyService index 99da54dbfa..94b5ba1691 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 99da54dbfa61c72d0c90acb07cb5ef9d36485d95 +Subproject commit 94b5ba1691d49130966455725e447e4070ae885e diff --git a/Loop b/Loop index 6f3a067077..b4a5567892 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 6f3a0670775012627b6549ce825081eb44cc7b48 +Subproject commit b4a5567892bd47c0524d80efe26aead326f82cde