From eb7a0eaa2f8914f6e7642db481b30a6fbe897c06 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Thu, 18 Sep 2025 20:02:10 -0700 Subject: [PATCH 1/9] update Loop: fix bolus recommendation edit --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index b9ac0264b7..8f14e60bac 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit b9ac0264b70f7ad49482a98ac0b01b67f66c05b2 +Subproject commit 8f14e60bacc3bcd0a2320f7b8145d930b2b974e3 From bee4ece7b2778c27f0ea04c88af46a1f72208fe7 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Thu, 18 Sep 2025 20:02:28 -0700 Subject: [PATCH 2/9] update DanaKit: finish string catalog conversion --- DanaKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DanaKit b/DanaKit index e3ddf217ce..3bedf70d81 160000 --- a/DanaKit +++ b/DanaKit @@ -1 +1 @@ -Subproject commit e3ddf217cef9e2f89d58ebd769a7281ee1343681 +Subproject commit 3bedf70d8117a54d82eec3ebadccd86589fb8c39 From f61e85fc97a32c4e7fe95f03ba166221fefa67c2 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Thu, 18 Sep 2025 20:02:42 -0700 Subject: [PATCH 3/9] Bump version to 3.8.1 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index 961356ddff..d3f3565dee 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.8.0 +LOOP_MARKETING_VERSION = 3.8.1 CURRENT_PROJECT_VERSION = 57 From f5f284c0267698481dc1e8e523b260c9c8089f90 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sun, 21 Sep 2025 13:37:35 -0700 Subject: [PATCH 4/9] update CGMBLEKit: restore going to CGM Manager page instead of Dexcom app from HUD glucose tap --- CGMBLEKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CGMBLEKit b/CGMBLEKit index 18811b95c0..eccccefc4b 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 18811b95c0a619e45b93365bf6f60398422b1e61 +Subproject commit eccccefc4be59ea16ccce77d01ccafb4ee3b7957 From 51a5a1292a192ff8bfb36eda6b7089636f11e6a5 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 23 Sep 2025 08:49:59 -0700 Subject: [PATCH 5/9] upgrade rexml per dependabot security warning --- Gemfile | 1 + Gemfile.lock | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 6d8667c818..f89fa7fe55 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,4 @@ source "https://rubygems.org" # This branch uses fastlane 2.228.0 plus pr 29596 gem "fastlane", git: "https://github.com/loopandlearn/fastlane.git", ref: "a670d4b092b274d58ebb5497126e47fc6a84f533" +gem "rexml", ">=3.4.2" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index d10e9b9f12..2ecc546e4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,25 +58,27 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.4.0) - aws-partitions (1.1116.0) - aws-sdk-core (3.225.2) + aws-partitions (1.1163.0) + aws-sdk-core (3.232.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 + bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.105.0) - aws-sdk-core (~> 3, >= 3.225.0) + aws-sdk-kms (1.112.0) + aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.189.1) - aws-sdk-core (~> 3, >= 3.225.0) + aws-sdk-s3 (1.199.0) + aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.3.0) + bigdecimal (3.2.3) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -105,10 +107,10 @@ GEM faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) @@ -163,13 +165,13 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.12.2) - jwt (2.10.1) + json (2.15.0) + jwt (2.10.2) base64 logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) - multi_json (1.15.0) + multi_json (1.17.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) @@ -185,15 +187,15 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.1) + rexml (3.4.4) rouge (3.28.0) ruby2_keywords (0.0.5) rubyzip (2.4.1) security (0.1.5) - signet (0.20.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) simctl (1.6.10) CFPropertyList @@ -233,6 +235,7 @@ PLATFORMS DEPENDENCIES fastlane! + rexml (>= 3.4.2) BUNDLED WITH 2.6.2 From cf2f41351f707077f072689401bfb1241e6e17a2 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 23 Sep 2025 11:39:56 -0700 Subject: [PATCH 6/9] update Loop: support audio for keep-alive options --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 8f14e60bac..b81d866ecb 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 8f14e60bacc3bcd0a2320f7b8145d930b2b974e3 +Subproject commit b81d866ecb246239c31a7dfb8fd3b16e547a7621 From e208050b054722c4ce8dca8295d5aad29571eff9 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 23 Sep 2025 11:41:07 -0700 Subject: [PATCH 7/9] update DanaKit: update to latest --- DanaKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DanaKit b/DanaKit index 3bedf70d81..3e606b8e12 160000 --- a/DanaKit +++ b/DanaKit @@ -1 +1 @@ -Subproject commit 3bedf70d8117a54d82eec3ebadccd86589fb8c39 +Subproject commit 3e606b8e12d08d27a5942e7f4af9a07b642b676f From 8cb66a0585c163a4741d889e384c6e54268696c2 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 23 Sep 2025 12:59:55 -0700 Subject: [PATCH 8/9] update Script to clean up older translation branches --- Scripts/manual_cleanup.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Scripts/manual_cleanup.sh b/Scripts/manual_cleanup.sh index 0dca109ce5..2db77ee306 100755 --- a/Scripts/manual_cleanup.sh +++ b/Scripts/manual_cleanup.sh @@ -21,6 +21,8 @@ echo echo " This deletes the xclocs, xliff_in, xliff_out folders" echo " This deletes the file, ${MESSAGE_FILE}, with the lokalise download timestamp" echo " This restores all submodules to their current branch (reset, clean)" +echo " If '${TRANSLATION_BRANCH}' branch exists and submodule is NOT on that branch:" +echo " then '${TRANSLATION_BRANCH}' branch is deleted" continue_or_quit ${0} @@ -31,9 +33,19 @@ rm -f "${MESSAGE_FILE}" for project in ${PROJECTS}; do IFS=":" read user dir branch <<< "$project" - echo "Reset and clean $dir" + echo + echo " *** Reset and clean $dir" cd $dir git reset --hard; git clean -fd; + current_branch=$(git branch --show-current 2>/dev/null) + if [[ "${current_branch}" == "${TRANSLATION_BRANCH}" ]]; then + echo " already on $TRANSLATION_BRANCH, take no action" + elif [ -n "$(git branch --list "$TRANSLATION_BRANCH")" ]; then + echo " Local branch '$TRANSLATION_BRANCH' exists, deleting it." + git branch -D "${TRANSLATION_BRANCH}" + else + echo " no branch named $TRANSLATION_BRANCH exists, take no action" + fi cd - done From 80417de4f21b7ffcc359d53e62656d82f6445ab4 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 23 Sep 2025 21:17:01 -0700 Subject: [PATCH 9/9] update submodule translations from lokalise on 23 Sep 2025 --- AmplitudeService | 2 +- CGMBLEKit | 2 +- LibreTransmitter | 2 +- LogglyService | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- MinimedKit | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- OmniKit | 2 +- RileyLinkKit | 2 +- TidepoolService | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 73c4425cb0..219c0099ab 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 73c4425cb06da435b65b76601ccaec3624255ec1 +Subproject commit 219c0099ab8397c665f101124b97828dc159ee14 diff --git a/CGMBLEKit b/CGMBLEKit index eccccefc4b..34e15c4f34 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit eccccefc4be59ea16ccce77d01ccafb4ee3b7957 +Subproject commit 34e15c4f34f1eeb04139d335c3fa9d93885dca8b diff --git a/LibreTransmitter b/LibreTransmitter index 709b22ea1a..bd804da3b1 160000 --- a/LibreTransmitter +++ b/LibreTransmitter @@ -1 +1 @@ -Subproject commit 709b22ea1a2ac1a096c9a7bb3d2e65f7839c2d51 +Subproject commit bd804da3b1b8ebf655693f90e9769845288c809a diff --git a/LogglyService b/LogglyService index 3e0f587dd6..6ba4824343 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 3e0f587dd661039d1e61e91d1eda24ac2e7f794d +Subproject commit 6ba482434343493a5f77ca28a7eeeafa8a250736 diff --git a/LoopKit b/LoopKit index d587ea2905..f8dafc7b6f 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit d587ea2905def1fbd7e5a988129fa38288eee3db +Subproject commit f8dafc7b6fd8c1dd6bc776854a5991a9b4e1d235 diff --git a/LoopOnboarding b/LoopOnboarding index 132252a75d..fde5efb4c2 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 132252a75d0957bba0605907b8fc3f241efb35ff +Subproject commit fde5efb4c2cc38dd994a70300cde808a479a1640 diff --git a/MinimedKit b/MinimedKit index e781a1d02e..a8f58a9935 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit e781a1d02e80916c84a7f00478b0f67eb93f36c3 +Subproject commit a8f58a993543a832400bd1427428f70300a5d4fa diff --git a/NightscoutService b/NightscoutService index 03f2a9fb2b..1bd42382f4 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 03f2a9fb2b4d7cb4bba268bbfc9fe3609809e60a +Subproject commit 1bd42382f4153bb15cc55228567cc8d453e05ca8 diff --git a/OmniBLE b/OmniBLE index 99ded91567..331e08d0da 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 99ded91567594c9ce0d5d0a86335670085ad5764 +Subproject commit 331e08d0da50ba88bccf1bc088f7760dde6395dc diff --git a/OmniKit b/OmniKit index 858618d2ed..cbf8dc00be 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 858618d2ed8fe5779152a8ce55e716fa1921e95d +Subproject commit cbf8dc00be1b21bed7c0872aee46a123b7954dc8 diff --git a/RileyLinkKit b/RileyLinkKit index 9ddd3888cf..7719fab42e 160000 --- a/RileyLinkKit +++ b/RileyLinkKit @@ -1 +1 @@ -Subproject commit 9ddd3888cf78bbf979bf69921a0097afe99fe7b3 +Subproject commit 7719fab42e476cf31a061d837c6ab1a521786f8e diff --git a/TidepoolService b/TidepoolService index 46b7b42bb3..1eb7ea11f6 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 46b7b42bb3029021937c3c79bad03a5949e8b37b +Subproject commit 1eb7ea11f63d1e5c34ad49c8718b9662b3fdb34f