From 9813b6729359c806a330b55461ae5badb6bf1533 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 2 May 2026 09:56:17 -0700 Subject: [PATCH 01/30] bump dev version to 3.13.2 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index b17045813b..e167b13dbe 100644 --- a/VersionOverride.xcconfig +++ b/VersionOverride.xcconfig @@ -8,5 +8,5 @@ // Version [for DIY Loop] // configure the version number in LoopWorkspace -LOOP_MARKETING_VERSION = 3.13.1 +LOOP_MARKETING_VERSION = 3.13.2 CURRENT_PROJECT_VERSION = 57 From d78449070f32c2a81ed55a54efbd7e3ff1100ecf Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 2 May 2026 10:03:09 -0700 Subject: [PATCH 02/30] update to fastlane 2.233.1 --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index ce5882953b..693763c712 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,2 @@ source "https://rubygems.org" -gem "fastlane", "2.232.1" +gem "fastlane", "2.233.1" diff --git a/Gemfile.lock b/Gemfile.lock index efe764ef44..db314c4320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,10 +68,11 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.4) faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.232.1) + fastlane (2.233.1) CFPropertyList (>= 2.3, < 4.0.0) abbrev (~> 0.1.2) addressable (>= 2.8, < 3.0.0) @@ -91,7 +92,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) - fastlane-sirp (>= 1.0.0) + fastlane-sirp (>= 1.1.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -121,8 +122,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-sirp (1.0.0) - sysrandom (~> 1.0) + fastlane-sirp (1.1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -202,7 +202,6 @@ GEM simctl (1.6.10) CFPropertyList naturally - sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -231,7 +230,7 @@ PLATFORMS ruby DEPENDENCIES - fastlane (= 2.232.1) + fastlane (= 2.233.1) BUNDLED WITH 4.0.6 From 47a04ba7aa695de9906275eccf758d5246049681 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 2 May 2026 10:10:37 -0700 Subject: [PATCH 03/30] address dependabot security warnings --- Gemfile | 2 ++ Gemfile.lock | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 693763c712..1a3b246f63 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,4 @@ source "https://rubygems.org" gem "fastlane", "2.233.1" +gem "json", ">=2.19.2" +gem "addressable", ">=2.9.0" diff --git a/Gemfile.lock b/Gemfile.lock index db314c4320..fc68ad7a36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.8) abbrev (0.1.2) - addressable (2.8.8) + addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) artifactory (3.0.17) atomos (0.1.3) @@ -166,7 +166,7 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.18.0) + json (2.19.4) jwt (2.10.2) base64 logger (1.7.0) @@ -230,7 +230,9 @@ PLATFORMS ruby DEPENDENCIES + addressable (>= 2.9.0) fastlane (= 2.233.1) + json (>= 2.19.2) BUNDLED WITH 4.0.6 From e1e24b4f455ceab1a51d0d61a78bf054a36e9e96 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 2 May 2026 11:27:14 -0700 Subject: [PATCH 04/30] update OmniBLE: PR 165: merge pod keep alive into dev --- OmniBLE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE b/OmniBLE index b0b78e66a6..14c03be4fd 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit b0b78e66a6962677970a00e5d37ae4157e548b8a +Subproject commit 14c03be4fdd5871a96243327655f974dc0cd9e69 From 076f608df43315418a0e1b4b8cb20889ae01c6ba Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 2 May 2026 11:33:25 -0700 Subject: [PATCH 05/30] update OmniBLE: translations from lokalise Sat May 2 08:19:53 PDT 2026 --- OmniBLE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE b/OmniBLE index 14c03be4fd..1912793284 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 14c03be4fdd5871a96243327655f974dc0cd9e69 +Subproject commit 1912793284b736754a0f25cf3d828e2eecd9ff2f From 5df8167634a8b7b6e05e807fb969b56c8e175c13 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sun, 3 May 2026 06:51:09 -0700 Subject: [PATCH 06/30] update CGMBLEKit: fix G6 sensor in future problem --- CGMBLEKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CGMBLEKit b/CGMBLEKit index ba5d0b7daf..98fae7929c 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit ba5d0b7daf83d282b587c8ff0e835162b8c75846 +Subproject commit 98fae7929c8c8e4e849d18a70c1f249dd6c09e5f From c946433a84006c6699b5d0e581edb6d1a3804799 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 5 May 2026 16:51:22 -0700 Subject: [PATCH 07/30] Add CONTRIBUTING.md file, adapt from Trio --- CONTRIBUTING.md | 137 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..b708ff16d8 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,137 @@ +# Contributing to Loop + +Thank you for your interest in contributing to Loop. + +Loop is a community effort, and contributions of all kinds are welcome. This document outlines some guidelines, good practices, and expectations for contributing to the project, with the goal of making collaboration and review as smooth as possible. + +Whether you are helping other users, improving documentation, translating the app, testing builds, reviewing code, or contributing new features and fixes, your work matters. + +Loop is built using the LoopWorkspace repository. The primary source for the app is at https://github.com/LoopKit/LoopWorkspace. + +## Ways to contribute + +There are many ways to support the Loop community: + +- **Help others** by answering questions and guiding users in support communities. +- Improve the **documentation** by updating or expanding LoopDocs. +- Improve the **app** by contributing code, fixes, features, or tests. +- Help with **translation and localization** through Loop lokalise. +- Support **testing and feedback** by validating changes and reporting issues clearly. + +### Pay it forward + +If Loop has helped you manage your diabetes successfully, consider paying it forward by helping others. Answering questions in [Loop Zulipchat](https://loop.zulipchat.com/) or the [Loop and Learn](https://www.facebook.com/groups/LOOPandLEARN) Facebook group can make a real difference for someone getting started. + +### Translate + +Loop is translated into multiple languages to make it easier to understand and use around the world. Translation for the submodules that make up the Loop app is managed through the [Loop lokalise project](https://loopkit.github.io/loopdocs/faqs/app-translation/#code-translation) and does not require programming experience. + +If your preferred language is missing, or you would like to improve an existing translation, please sign up as a translator following the directions in the link above. + +### Develop + +Do you work with Swift? UI/UX? Testing? API optimization? Data storage? + +Loop is a collaborative project, and contributions of all kinds are welcome. Whether you are writing code, improving the user experience, testing builds, helping with documentation, or contributing in other ways, your help matters. + +## General principles + +- Start small. Smaller, focused contributions are easier to review, test, and merge. +- For larger changes or new features, open or reference an issue first so there is a clear place for discussion and progress tracking. +- Reach out early if you are planning to work on something substantial, especially if it may overlap with work already in progress. +- Keep discussions constructive, respectful, and focused on improving Loop for the community. +- Remember that Loop is part of a wider open source AID ecosystem. Collaboration and maintainability matter just as much as shipping features. + +## Development guidelines + +### Coding conventions + +- Use Xcode and follow the existing formatting and style used throughout the codebase. +- Keep indentation and formatting consistent in every file you change. +- Format your code before committing. +- Avoid unrelated formatting-only changes in files you are not otherwise modifying. +- Choose clear, readable code over clever or overly compact solutions. +- Follow existing naming, file organization, and architectural patterns unless there is a good reason not to. + +### Strings and localization + +- Add new user-facing strings in the appropriate localization mechanism used by the app. +- Provide English source strings only unless the contribution is specifically about translations. +- Translation and localization for other languages should go through the [Loop lokalise project](https://loopkit.github.io/loopdocs/faqs/app-translation/#code-translation). + +### Documentation + +- Update docstrings when your change affects setup, configuration, behavior, workflows, or troubleshooting. +- Keep documentation changes clear and practical. +- ocumentation contributions are just as valuable as code contributions. + +## Branches, commits, and pull requests + +### Getting started + +The example below is for the Loop repository. Similar contributions can be made to other respositories as needed. + +1. Fork the `dev` branch of the [Loop repository](https://github.com/LoopKit/Loop) on GitHub. +1. Create a separate branch for each feature or fix with an [appropriate name](#branch-names). +1. Branch from the most recent appropriate development branch (typically `dev`). +1. Commit your changes to your fork. +1. When ready, open a pull request against the upstream repository (`LoopKit/Loop`). + +### Before opening a pull request + +- Rebase or otherwise sync your branch with the latest target branch. +- Make sure your change is focused and does not include unrelated edits. +- Test your changes as thoroughly as you reasonably can. +- Update relevant documentation when needed. +- Double-check for debug code, commented-out code, accidental version changes, or temporary workarounds left behind. + +### Pull request guidance + +- Keep pull requests as small and focused as practical. +- Use a clear title and description. +- Explain **what** changed and **why**. +- Link the relevant issue when applicable. +- Mention any areas that need particular review attention. +- Be open to feedback and follow-up changes during review. +- Use AI tools, if at all, as a support for small, well-understood tasks rather than to generate large parts of a contribution +- Do not submit AI-heavy or "vibe-coded" pull requests; we welcome thoughtful use of tooling, but contributions need to be intentionally designed. + +## Naming conventions + +### Branch names + +Use short, descriptive branch names that make the purpose of the change obvious. For example: + +- `fix/watchstate-sync` +- `feature/onboarding-target-behavior` +- `refactor/therapy-editor` + +### Pull request titles + +Use concise, descriptive pull request titles. Good titles usually start with the type of change, for example: + +- `Fix watch state sync timing issue` +- `Add onboarding step for target behavior` +- `Update build documentation` + +## Communication and coordination + +For new ideas, larger features, or work that may affect multiple parts of the app, **discuss it with the community first** — reach out to the contributor core on [Loop Zulipchat](https://loop.zulipchat.com/). This helps reduce duplicate work, avoid merge conflicts, and improve the final design. + +## Review expectations + +Please remember that Loop is maintained by contributors with limited time. Reviews may take time, and some pull requests may require iteration before they are ready to merge. + +To help keep reviews efficient: + +- Keep the scope narrow. +- Explain your reasoning clearly. +- Respond to review comments directly. +- Avoid force-pushing large unexplained rewrites during active review unless necessary. +- AI-assisted work is welcome for limited, well-understood tasks, but contributions should remain author-driven and must be code you fully understand, and can explain. + +We do not accept pull requests that are largely AI-generated or submitted without careful engineering judgment, testing, and alignment with Loop’s existing patterns. + +## Final note + +Loop exists because people choose to contribute their time, knowledge, and care to a shared effort. Thank you for helping improve the project and support the broader open source AID community. From 2858d517f158ef3300a21613e922916af7368265 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sun, 10 May 2026 10:22:09 -0700 Subject: [PATCH 08/30] update Loop: fix Live Activity plot: colors, override, target, range, labels --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 367a9878f5..493f59677e 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 367a9878f5274be3ad5ead4142e2837bc0c394c2 +Subproject commit 493f59677ec0c2514df6e2abe87fa8719e3c9777 From f4e922561479638b09f7e1eeb63a733446d7b448 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 12 May 2026 12:38:30 -0700 Subject: [PATCH 09/30] update Loop: fix watch Live-Activity to open Loop Watch App --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 493f59677e..f066d40f90 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 493f59677ec0c2514df6e2abe87fa8719e3c9777 +Subproject commit f066d40f90e6b81de2bd8f25d86e56e3544793f0 From 8375c01246f2634c2fdb12c99f8a04ece848c118 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 12 May 2026 20:30:33 -0700 Subject: [PATCH 10/30] update submodules: translation and language updates --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LibreTransmitter | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- MinimedKit | 2 +- NightscoutRemoteCGM | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- OmniKit | 2 +- RileyLinkKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 5a7e8c69f5..fd9df8f489 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 5a7e8c69f545bd8a2347dd35f68c7ac95ec4492b +Subproject commit fd9df8f48947f2cadc2a017ab88fdae074e32d96 diff --git a/CGMBLEKit b/CGMBLEKit index 98fae7929c..edd8fb232e 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 98fae7929c8c8e4e849d18a70c1f249dd6c09e5f +Subproject commit edd8fb232e18a09a6c162b489172ea9d381d7bb6 diff --git a/G7SensorKit b/G7SensorKit index 4d0780db06..890e60754d 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 4d0780db06c7c95b3a3bf3cdb2f2838d521e411a +Subproject commit 890e60754ded6b1610c8b8fac7a3c026bf704a64 diff --git a/LibreTransmitter b/LibreTransmitter index 20f6d0e171..d0d301208f 160000 --- a/LibreTransmitter +++ b/LibreTransmitter @@ -1 +1 @@ -Subproject commit 20f6d0e171450b294b202cefa8edaf2c5e4a5150 +Subproject commit d0d301208faeb2bc763454baf0550f3fd4888bb7 diff --git a/LogglyService b/LogglyService index 0a8f3c83be..d6df99ea34 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 0a8f3c83bed117248c56acf8278b18a88f399988 +Subproject commit d6df99ea34658c42eb721829d29812645c08fdad diff --git a/Loop b/Loop index f066d40f90..40ae514ef2 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit f066d40f90e6b81de2bd8f25d86e56e3544793f0 +Subproject commit 40ae514ef2cb6ee8cf0a62177de3072a460ee2e4 diff --git a/LoopKit b/LoopKit index 835c45a317..e7e2ee2b54 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 835c45a31789305f4e26af58405124b8a5fd45f7 +Subproject commit e7e2ee2b546c4d8122014838cb98a0e26dd91208 diff --git a/LoopOnboarding b/LoopOnboarding index 6fbc8c7ae2..64f978e143 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 6fbc8c7ae2594cd0931b5ea9a36b015fafcd2b13 +Subproject commit 64f978e143723765452957cef06a99db380b128c diff --git a/LoopSupport b/LoopSupport index e470d203d3..0c296289ed 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit e470d203d386895515a058f36ddfd741da185108 +Subproject commit 0c296289ed8698cbc3acd4c1ea1b39a600c0dbc3 diff --git a/MinimedKit b/MinimedKit index ba80a8f46a..106467e8f8 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit ba80a8f46aa6582818289e7457574017281351e6 +Subproject commit 106467e8f8effeae5a2872d121a33b548350f25c diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM index d442e9f24f..383d3c1e6b 160000 --- a/NightscoutRemoteCGM +++ b/NightscoutRemoteCGM @@ -1 +1 @@ -Subproject commit d442e9f24f5f42cf2d5d8725809ad64084be10cf +Subproject commit 383d3c1e6b7c0c79def98a1633e4a5856bf221a4 diff --git a/NightscoutService b/NightscoutService index d6785fdcaa..7721a8da0d 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit d6785fdcaa47fcd9efa3da19dd4be97efaedb806 +Subproject commit 7721a8da0de4f69fbc6994bdaa5c860ba9a99ede diff --git a/OmniBLE b/OmniBLE index 1912793284..4e212a81aa 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 1912793284b736754a0f25cf3d828e2eecd9ff2f +Subproject commit 4e212a81aa30e3aedeb04cec6644c39463f9db8b diff --git a/OmniKit b/OmniKit index 38af22b3d3..2b4253b9fd 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 38af22b3d36e05a4cdffb242a1a47b347a4031fc +Subproject commit 2b4253b9fd3ec167d8a6b198dae6b59606058808 diff --git a/RileyLinkKit b/RileyLinkKit index 8dad76d152..d953e1c79b 160000 --- a/RileyLinkKit +++ b/RileyLinkKit @@ -1 +1 @@ -Subproject commit 8dad76d15295e13e091be74f6f47dbca5f0eb022 +Subproject commit d953e1c79b36f06d68b7255bb8f4331d906cc30d diff --git a/TidepoolService b/TidepoolService index 5f4927dcac..4ef78bf8b5 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 5f4927dcac2b17276776b83016896997001b1a67 +Subproject commit 4ef78bf8b58e2cee3e7f00fe7670fc2a7b166874 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 875faf232b..04804892ea 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 875faf232bb3f13d619512f9e8b47a2d5acac433 +Subproject commit 04804892ea58778472e19c738ae39a87f41c0070 From cda13b7c3098bb476b99acfb3d84775afa7e40d6 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Wed, 13 May 2026 16:00:44 -0700 Subject: [PATCH 11/30] Bump version to 3.14.0 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index e167b13dbe..b176650a02 100644 --- a/VersionOverride.xcconfig +++ b/VersionOverride.xcconfig @@ -8,5 +8,5 @@ // Version [for DIY Loop] // configure the version number in LoopWorkspace -LOOP_MARKETING_VERSION = 3.13.2 +LOOP_MARKETING_VERSION = 3.14.0 CURRENT_PROJECT_VERSION = 57 From 0eac0f8f638b0f766320bf7831e1bcbe5cbc555c Mon Sep 17 00:00:00 2001 From: marionbarker Date: Wed, 13 May 2026 16:22:24 -0700 Subject: [PATCH 12/30] chore: update to fastlane 2.234.0 --- Gemfile | 4 +--- Gemfile.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 1a3b246f63..f8b2b1e969 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,2 @@ source "https://rubygems.org" -gem "fastlane", "2.233.1" -gem "json", ">=2.19.2" -gem "addressable", ">=2.9.0" +gem "fastlane", "2.234.0" diff --git a/Gemfile.lock b/Gemfile.lock index fc68ad7a36..ae7d7b3417 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,14 +72,14 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.233.1) - CFPropertyList (>= 2.3, < 4.0.0) - abbrev (~> 0.1.2) + fastlane (2.234.0) + CFPropertyList (>= 2.3, < 5.0.0) + abbrev (~> 0.1) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.197) babosa (>= 1.0.3, < 2.0.0) - base64 (~> 0.2.0) + base64 (~> 0.2) benchmark (>= 0.1.0) bundler (>= 1.17.3, < 5.0.0) colored (~> 1.2) @@ -105,9 +105,9 @@ GEM logger (>= 1.6, < 2.0) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) - mutex_m (~> 0.3.0) + mutex_m (~> 0.3) naturally (~> 2.2) - nkf (~> 0.2.0) + nkf (~> 0.2) optparse (>= 0.1.1, < 1.0.0) ostruct (>= 0.1.0) plist (>= 3.1.0, < 4.0.0) @@ -230,9 +230,7 @@ PLATFORMS ruby DEPENDENCIES - addressable (>= 2.9.0) - fastlane (= 2.233.1) - json (>= 2.19.2) + fastlane (= 2.234.0) BUNDLED WITH 4.0.6 From 51e974a1454e3766490e4a64eae4b8a1e234dbb9 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 22 May 2026 12:26:46 -0700 Subject: [PATCH 13/30] bump dev version to 3.14.1 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index b176650a02..3b8a554641 100644 --- a/VersionOverride.xcconfig +++ b/VersionOverride.xcconfig @@ -8,5 +8,5 @@ // Version [for DIY Loop] // configure the version number in LoopWorkspace -LOOP_MARKETING_VERSION = 3.14.0 +LOOP_MARKETING_VERSION = 3.14.1 CURRENT_PROJECT_VERSION = 57 From 382b58d2e61350aba35cafa34568ae7ac7fd70e5 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 22 May 2026 17:39:58 -0700 Subject: [PATCH 14/30] update Loop: Warn at launch on development (dev branch) builds --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 40ae514ef2..e3229270a2 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 40ae514ef2cb6ee8cf0a62177de3072a460ee2e4 +Subproject commit e3229270a2704a601ef69ed3f407195717d5b09e From 4ad21c11984449d7948b5560ad589084ef62f7e2 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 29 May 2026 10:53:52 -0700 Subject: [PATCH 15/30] Bump version to 3.14.2 --- OmniBLE | 2 +- VersionOverride.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE b/OmniBLE index 4e212a81aa..28f0503d93 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 4e212a81aa30e3aedeb04cec6644c39463f9db8b +Subproject commit 28f0503d933eee243c4ba3fbbec5c7da003ff93d diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index 3b8a554641..5253477701 100644 --- a/VersionOverride.xcconfig +++ b/VersionOverride.xcconfig @@ -8,5 +8,5 @@ // Version [for DIY Loop] // configure the version number in LoopWorkspace -LOOP_MARKETING_VERSION = 3.14.1 +LOOP_MARKETING_VERSION = 3.14.2 CURRENT_PROJECT_VERSION = 57 From 488c57a7e2a17ba7a26e9ce44c002a44f2450445 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 29 May 2026 11:05:35 -0700 Subject: [PATCH 16/30] update Loop: warn if on dev, support OmnipodKit --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index e3229270a2..1f71ec4fa9 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit e3229270a2704a601ef69ed3f407195717d5b09e +Subproject commit 1f71ec4fa94941abdbd72fd5bd914770faa2e90b From b27af62369a2ad7a7634fce870df3b8956e7aa69 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 29 May 2026 11:06:26 -0700 Subject: [PATCH 17/30] update OmniBLE: fix identifier for 17e for Pod Keep Alive --- OmniBLE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE b/OmniBLE index 28f0503d93..29358d59cf 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 28f0503d933eee243c4ba3fbbec5c7da003ff93d +Subproject commit 29358d59cf51195af41566b5e368acecc89aa5f3 From e18ef9af1a47fedf3e84bcad42ea85f89d1c12ab Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 30 May 2026 13:28:40 -0700 Subject: [PATCH 18/30] update GitHub action to use Xcode 26.4 --- .github/workflows/build_loop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index fab987e7b3..9dab27ff57 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -175,7 +175,7 @@ jobs: (vars.SCHEDULED_SYNC != 'false' && needs.check_status.outputs.NEW_COMMITS == 'true' ) steps: - name: Select Xcode version - run: "sudo xcode-select --switch /Applications/Xcode_26.2.app/Contents/Developer" + run: "sudo xcode-select --switch /Applications/Xcode_26.4.app/Contents/Developer" - name: Checkout Repo for building uses: actions/checkout@v5 From 4cf9e3476a43b62936025fe457bc65c426eda9e6 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sat, 30 May 2026 13:31:54 -0700 Subject: [PATCH 19/30] update to fastlane 2.335.0 --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index f8b2b1e969..0eb90cb08b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,2 @@ source "https://rubygems.org" -gem "fastlane", "2.234.0" +gem "fastlane", "2.235.0" diff --git a/Gemfile.lock b/Gemfile.lock index ae7d7b3417..0089a8cdb4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.234.0) + fastlane (2.235.0) CFPropertyList (>= 2.3, < 5.0.0) abbrev (~> 0.1) addressable (>= 2.8, < 3.0.0) @@ -81,7 +81,7 @@ GEM babosa (>= 1.0.3, < 2.0.0) base64 (~> 0.2) benchmark (>= 0.1.0) - bundler (>= 1.17.3, < 5.0.0) + bundler (>= 2.4.0, < 5.0.0) colored (~> 1.2) commander (~> 4.6) csv (~> 3.3) @@ -96,12 +96,12 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, <= 2.1.1) + google-cloud-env (>= 1.6.0, < 2.3.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) json (< 3.0.0) - jwt (>= 2.1.0, < 3) + jwt (>= 2.1.0, < 4) logger (>= 1.6, < 2.0) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) @@ -230,7 +230,7 @@ PLATFORMS ruby DEPENDENCIES - fastlane (= 2.234.0) + fastlane (= 2.235.0) BUNDLED WITH - 4.0.6 + 4.0.12 From a61dab4d38e2329da27c1a57feb2f792b70aa5ee Mon Sep 17 00:00:00 2001 From: marionbarker Date: Mon, 1 Jun 2026 08:14:30 -0700 Subject: [PATCH 20/30] add submodule OmnipodKit: * includes DASH Pod Keep Alive Feature; * update Scrips define_common.sh --- .gitmodules | 3 +++ .../contents.xcworkspacedata | 3 +++ .../xcschemes/LoopWorkspace.xcscheme | 24 +++++++++++++++++++ OmnipodKit | 1 + Scripts/define_common.sh | 4 ++-- 5 files changed, 33 insertions(+), 2 deletions(-) create mode 160000 OmnipodKit diff --git a/.gitmodules b/.gitmodules index 1308e60c03..ddc1a846b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "LibreTransmitter"] path = LibreTransmitter url = https://github.com/LoopKit/LibreTransmitter.git +[submodule "OmnipodKit"] + path = OmnipodKit + url = https://github.com/loopandlearn/OmnipodKit diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index a870f8b7c9..1205c52c40 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -120,6 +120,9 @@ + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index e09bc55654..2ae784b532 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -146,6 +146,20 @@ ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj"> + + + + + + + + Date: Wed, 3 Jun 2026 15:53:34 -0700 Subject: [PATCH 21/30] update OmnipodKit: update localization --- OmnipodKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmnipodKit b/OmnipodKit index c04c4d4ded..d68699c8cb 160000 --- a/OmnipodKit +++ b/OmnipodKit @@ -1 +1 @@ -Subproject commit c04c4d4ded244b5fbfac6fba5e55af08fa2d127d +Subproject commit d68699c8cbaa2623375d4ae8576634101c6850b9 From dd94296e242da4c04f9faed873be421d614f9f90 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Thu, 4 Jun 2026 13:56:15 -0700 Subject: [PATCH 22/30] add MedtrumKit submodule --- .gitmodules | 3 +++ LoopWorkspace.xcworkspace/contents.xcworkspacedata | 3 +++ .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 14 ++++++++++++++ MedtrumKit | 1 + 4 files changed, 21 insertions(+) create mode 160000 MedtrumKit diff --git a/.gitmodules b/.gitmodules index ddc1a846b5..dfb943a7b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "OmnipodKit"] path = OmnipodKit url = https://github.com/loopandlearn/OmnipodKit +[submodule "MedtrumKit"] + path = MedtrumKit + url = https://github.com/jbr7rr/MedtrumKit diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 1205c52c40..b29b113e54 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -123,6 +123,9 @@ + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 2ae784b532..79b67abcde 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -132,6 +132,20 @@ ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj"> + + + + Date: Thu, 4 Jun 2026 14:31:47 -0700 Subject: [PATCH 23/30] add MedtrumKit tests --- .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 79b67abcde..4d893c5124 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -577,6 +577,16 @@ ReferencedContainer = "container:OmnipodKit/OmnipodKit.xcodeproj"> + + + + Date: Thu, 4 Jun 2026 14:36:41 -0700 Subject: [PATCH 24/30] add EversenseKit submodule --- .gitmodules | 3 +++ EversenseKit | 1 + LoopWorkspace.xcworkspace/contents.xcworkspacedata | 3 +++ .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 14 ++++++++++++++ 4 files changed, 21 insertions(+) create mode 160000 EversenseKit diff --git a/.gitmodules b/.gitmodules index dfb943a7b7..c23f341c7e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,6 @@ [submodule "MedtrumKit"] path = MedtrumKit url = https://github.com/jbr7rr/MedtrumKit +[submodule "EversenseKit"] + path = EversenseKit + url = https://github.com/bastiaanv/EversenseKit diff --git a/EversenseKit b/EversenseKit new file mode 160000 index 0000000000..43b808002f --- /dev/null +++ b/EversenseKit @@ -0,0 +1 @@ +Subproject commit 43b808002ffb88f29dc628cb609ca06eca8c7aeb diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index b29b113e54..23cf6fec8c 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -126,6 +126,9 @@ + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 4d893c5124..6a1a24101c 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -286,6 +286,20 @@ ReferencedContainer = "container:TrueTime.swift/TrueTime.xcodeproj"> + + + + Date: Thu, 4 Jun 2026 14:55:00 -0700 Subject: [PATCH 25/30] add EversenseKit tests --- .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 6a1a24101c..4b1ed55708 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -601,6 +601,16 @@ ReferencedContainer = "container:MedtrumKit/MedtrumKit.xcodeproj"> + + + + Date: Thu, 4 Jun 2026 17:11:40 -0700 Subject: [PATCH 26/30] Revert "add EversenseKit tests" until the issues are resolved This reverts commit c0a55926f25f7911cf26c826aea26986327277e0. --- .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 4b1ed55708..6a1a24101c 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -601,16 +601,6 @@ ReferencedContainer = "container:MedtrumKit/MedtrumKit.xcodeproj"> - - - - Date: Fri, 5 Jun 2026 06:56:13 -0700 Subject: [PATCH 27/30] remove OmniKit submodule, replaced with OmnipodKit --- .gitmodules | 3 --- .../contents.xcworkspacedata | 3 --- .../xcschemes/LoopWorkspace.xcscheme | 24 ------------------- OmniKit | 1 - 4 files changed, 31 deletions(-) delete mode 160000 OmniKit diff --git a/.gitmodules b/.gitmodules index c23f341c7e..53252a65df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,9 +46,6 @@ [submodule "TidepoolService"] path = TidepoolService url = https://github.com/LoopKit/TidepoolService.git -[submodule "OmniKit"] - path = OmniKit - url = https://github.com/LoopKit/OmniKit.git [submodule "MinimedKit"] path = MinimedKit url = https://github.com/LoopKit/MinimedKit.git diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 23cf6fec8c..4620fa6a12 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -111,9 +111,6 @@ - - diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 6a1a24101c..36c20272d5 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -174,20 +174,6 @@ ReferencedContainer = "container:OmnipodKit/OmnipodKit.xcodeproj"> - - - - - - - - Date: Fri, 5 Jun 2026 07:04:46 -0700 Subject: [PATCH 28/30] remove OmniBLE submodule, replaced with OmnipodKit --- .gitmodules | 3 -- .../contents.xcworkspacedata | 3 -- .../xcschemes/LoopWorkspace.xcscheme | 38 ------------------- OmniBLE | 1 - 4 files changed, 45 deletions(-) delete mode 160000 OmniBLE diff --git a/.gitmodules b/.gitmodules index 53252a65df..f3472ea060 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "LogglyService"] path = LogglyService url = https://github.com/LoopKit/LogglyService.git -[submodule "OmniBLE"] - path = OmniBLE - url = https://github.com/LoopKit/OmniBLE.git [submodule "NightscoutRemoteCGM"] path = NightscoutRemoteCGM url = https://github.com/LoopKit/NightscoutRemoteCGM.git diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 4620fa6a12..fed13e7d24 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -108,9 +108,6 @@ - - diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 36c20272d5..19f95ce326 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -174,20 +174,6 @@ ReferencedContainer = "container:OmnipodKit/OmnipodKit.xcodeproj"> - - - - - - - - - - - - Date: Fri, 5 Jun 2026 14:46:59 -0700 Subject: [PATCH 29/30] update Scripts for 3.14.2 --- Scripts/LocalizationInstructions.md | 47 +++++++++++++++++++++++++++++ Scripts/define_common.sh | 2 ++ Scripts/update_submodule_refs.sh | 13 +++++++- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/Scripts/LocalizationInstructions.md b/Scripts/LocalizationInstructions.md index 17e0f450d5..d3ec622e94 100644 --- a/Scripts/LocalizationInstructions.md +++ b/Scripts/LocalizationInstructions.md @@ -19,10 +19,21 @@ Table of Contents: * [Prepare xliff_out folder](#prepare-xliff_out-folder) * [Update lokalise strings](#update-lokalise-strings) * [Utility Scripts](#utility-scripts) + * [Additional Utility Scripts](#additional-utility-scripts) * [Questions and notes](#questions-and-notes) ## Overview +> The translations for these repositories are added to lokalise +> * DanaKit +> * EversenseKit +> * MedtrumKit +> * OmnipodKit + +> In order to manage those localization strings, the translation work will be done in the feat/all-managers branch, which includes all repositories. + +> The Scripts needed to handle these new repositories are found on in this branch (for now). + Translations for Loop are performed by volunteers at [lokalise](https://app.lokalise.com/projects). Several scripts were added to assist in bringing those translations into the repositories and updating keys when strings are added or modified. @@ -305,6 +316,42 @@ The define_common.sh is used by other scripts to provide a single source for the If you need to start over but don't want to lose prior work, use archive_translations.sh. However, this is probably no longer necessary with the optional arguments available with the manual scripts. +### Additional Utility Scripts + +These scripts, currently found in feat/all-managers, are used for several purposes but are not part of the Localization process. + +They are documented here for convenience. The alphabetic list is provided here. + +* open_selected_url.sh +* reconfigure_remotes.sh +* update_loopandlearn_forks.sh +* update_submodule_refs.sh + +#### update_submodules_refs + +This is used to checkout the most recent branch for each submodule in the workspace. It is used as a final step after the translation is completed but also is used to bring in other updates from the submodules into the workspace. + +After running this script, use `git status` to determine which submodules were updated so the modifications can be tested and committed. + +#### reconfigure_remotes + +This is a helper script for a LoopWorkspace clone for use when the .gitmodules path name changes for any reason, and the local clone needs to be updated. + +This change was made because (2026 April 30) the translation work for feature branches and the submodule update work were using different paths and it was just too confusing and error prone. By using the upstream fork in .gitmodules and in the translations scripts, life is simpler. + +* The path for DanaKit, EversenseKit and MedtrumKit was changed from loopandlearn to the respective upstream repositories +* If a local clone has any submodules pointing to loopandlearn as the remote named `origin`, run this script to update it + +There is no harm running the script even if all submodules are properly configured. + +### Trio Utility Scripts + +These are Trio support utilities run within a LoopWorkspace clone to sync the loopandlearn forks for use with Trio. They require appropriate permissions. + +We support Trio with some of the submodules. To enable Trio to use a slightly modified version of the repositories, Trio uses loopandlearn, not the upstream repos in their `.gitmodule` list. In order to keep the loopandlearn forks up to date, the `update_loopandlearn_forks.sh` automatically updates all the submodules used by Trio so that loopandlearn forks match the upstream forks for the appropriate branches. + +When there are submodules where Trio uses a slightly different version of code, a `trio` branch is created. In that case, the update is done manually. To assist in the process, the script `open_selected_url.sh` is called from within the `update_loopandlearn_forks.sh` script. + ## Questions and notes Most of the questions were worked through while developing the new scripts. diff --git a/Scripts/define_common.sh b/Scripts/define_common.sh index dc5114592e..55149dea1d 100755 --- a/Scripts/define_common.sh +++ b/Scripts/define_common.sh @@ -79,6 +79,8 @@ PROJECTS=( \ LoopKit:RileyLinkKit:dev \ LoopKit:TidepoolService:dev \ loopandlearn:OmnipodKit:main \ + bastiaanv:EversenseKit:dev \ + jbr7rr:MedtrumKit:dev \ ) function section_divider() { diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh index b9edba347a..3fb71658a0 100755 --- a/Scripts/update_submodule_refs.sh +++ b/Scripts/update_submodule_refs.sh @@ -2,13 +2,24 @@ source Scripts/define_common.sh +section_divider +echo "You are running ${0}" +echo +echo " This modifies your local clone, in whatever branch is currently selected," +echo " so that every submodule is at the tip of the appropriate branch." +echo +current_branch=$(git branch --show-current 2>/dev/null) +echo " The current LoopWorkspace branch is $current_branch" + +continue_or_quit ${0} + for project in ${PROJECTS}; do + echo echo "Updating to $project" IFS=":" read user dir branch <<< "$project" echo "Updating to $branch on $user/$project" cd $dir git checkout $branch - #git branch -D tidepool-sync git pull cd - done From 4dfa028a13a36b905570add033ef0453ecd31bda Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 5 Jun 2026 14:57:41 -0700 Subject: [PATCH 30/30] remove OmniBLE and OmniKit from Scripts/define_common.sh --- Scripts/define_common.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Scripts/define_common.sh b/Scripts/define_common.sh index 55149dea1d..a1a8aa197a 100755 --- a/Scripts/define_common.sh +++ b/Scripts/define_common.sh @@ -74,8 +74,6 @@ PROJECTS=( \ LoopKit:MinimedKit:main \ LoopKit:NightscoutRemoteCGM:dev \ LoopKit:NightscoutService:dev \ - LoopKit:OmniBLE:dev \ - LoopKit:OmniKit:main \ LoopKit:RileyLinkKit:dev \ LoopKit:TidepoolService:dev \ loopandlearn:OmnipodKit:main \