Merge pull request #395 from LoopKit/release/3.10.0

marionbarker · web-flow · commit fa39dbf91109 · 2026-01-10T13:41:06.000-08:00
Release/3.10.0
diff --git a/.github/workflows/validate_secrets.yml b/.github/workflows/validate_secrets.yml
@@ -171,8 +171,8 @@ jobs:
           elif ! echo "$FASTLANE_KEY" | openssl pkcs8 -nocrypt >/dev/null; then
             failed=true
             echo "::error::The FASTLANE_KEY secret is set but invalid. Verify that you copied it correctly from the API Key file (*.p8) you downloaded and try again."
-          elif ! (bundle exec fastlane validate_secrets 2>&1 || true) | tee fastlane.log; then # ignore "fastlane validate_secrets" errors and continue on errors without annotating an exit code
-            if grep -q "bad decrypt" fastlane.log; then
+          elif ! bundle exec fastlane validate_secrets 2>&1 | tee fastlane.log; then
+            if grep -q "Couldn't decrypt the repo" fastlane.log; then
               failed=true
               echo "::error::Unable to decrypt the Match-Secrets repository using the MATCH_PASSWORD secret. Verify that it is set correctly and try again."
             elif grep -q -e "required agreement" -e "license agreement" fastlane.log; then
diff --git a/CGMBLEKit b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 2e2ba3bdfdd90f4a00229f396b775b889da9876e
+Subproject commit a442ea0a21078e82264176a89617d2f9a3a6f36d
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 5139111ec6aa8a098163eab424a3a65bda09b86a
+Subproject commit ee064ddcc1c13e0050ee56d0eec38a6bdc0d3c76
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,3 @@
 source "https://rubygems.org"
 
-# gem "fastlane"
-
-# 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"
+gem "fastlane", "2.230.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,125 +1,120 @@
-GIT
-  remote: https://github.com/loopandlearn/fastlane.git
-  revision: a670d4b092b274d58ebb5497126e47fc6a84f533
-  ref: a670d4b092b274d58ebb5497126e47fc6a84f533
-  specs:
-    fastlane (2.228.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored (~> 1.2)
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
-      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.0.0)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      http-cookie (~> 1.0.5)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (>= 2.0.0, < 3.0.0)
-      naturally (~> 2.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.1)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1163.0)
-    aws-sdk-core (3.232.0)
+    aws-partitions (1.1200.0)
+    aws-sdk-core (3.240.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.112.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.199.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-s3 (1.209.0)
+      aws-sdk-core (~> 3, >= 3.234.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)
+    base64 (0.2.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
-      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
+    fastlane (2.230.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      base64 (~> 0.2.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      csv (~> 3.3)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      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.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      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)
+      naturally (~> 2.2)
+      nkf (~> 0.2.0)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      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)
     gh_inspector (1.1.3)
@@ -165,23 +160,23 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.15.0)
+    json (2.18.0)
     jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.17.0)
+    multi_json (1.19.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.3.0)
     nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.8.1)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.3.0)
+    public_suffix (7.0.0)
+    rake (13.3.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -225,17 +220,11 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
-  arm64-darwin-24
-  x86_64-darwin-19
-  x86_64-darwin-24
-  x86_64-linux
+  arm64-darwin-25
+  ruby
 
 DEPENDENCIES
-  fastlane!
-  rexml (>= 3.4.2)
+  fastlane (= 2.230.0)
 
 BUNDLED WITH
-   2.6.2
+   2.7.2
diff --git a/LibreTransmitter b/LibreTransmitter
@@ -1 +1 @@
-Subproject commit 25c31bae22082caaa6823179010129912d6c8f8f
+Subproject commit 38cc483f3d7716735ceee6e57b6ed4dd68eaf1d0
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit c54fb10127f6365480d38258744d5d68918fae83
+Subproject commit db9cf70d7292803308e0e7f3c5f1f7fe6d801c9e
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 7237c73ce6f90475d356dffc6e155d7cc2b96240
+Subproject commit 675854c9e98a52ca9ac9f23837c313ceddcff414
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit 1370d8b3421765996e8e421be2ad94cb7f099af8
+Subproject commit 53dadd6d3e4f0e1630e97f432054b48e28aab287
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
@@ -3,7 +3,7 @@
    LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
diff --git a/MinimedKit b/MinimedKit
@@ -1 +1 @@
-Subproject commit a1888623f398994e07ad970a0164be1117e9bec1
+Subproject commit d52c0f8f1fe615760794fdac233ba78657449870
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
@@ -1 +1 @@
-Subproject commit acf26dbcfa34e041ecf6b798d80fc16689b52b6d
+Subproject commit 68a566533ae9a647c02a7137bae5b4f9c6af3a6e
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit b65dbfc2e34ea1f63c7c6d946aa828fcaba103af
+Subproject commit ffec85de22d979e4bee6535c374ab72c692e101b
diff --git a/OmniKit b/OmniKit
@@ -1 +1 @@
-Subproject commit 103fe3ca161ece2ff78e3c369149ff4561af669a
+Subproject commit 64731f0b31d61cae14d00528a9c2bf78ea6da9a6
diff --git a/RileyLinkKit b/RileyLinkKit
@@ -1 +1 @@
-Subproject commit dc15267542d62f8ea3d869d5cd0bf7739bd9fe4d
+Subproject commit 83b211a442672612e1790c2f0d393aeb23600b5f
diff --git a/Scripts/define_common.sh b/Scripts/define_common.sh
@@ -65,7 +65,6 @@ PROJECTS=( \
     LoopKit:AmplitudeService:dev \
     LoopKit:CGMBLEKit:dev \
     LoopKit:dexcom-share-client-swift:dev \
-    loopandlearn:DanaKit:dev \
     LoopKit:G7SensorKit:main \
     LoopKit:LibreTransmitter:main \
     LoopKit:LogglyService:dev \
diff --git a/Scripts/manual_upload_to_lokalise.sh b/Scripts/manual_upload_to_lokalise.sh
@@ -37,13 +37,17 @@ foreach lang in $LANGUAGES
 # modify the hyphen to underscore to support lokalise lang-iso expectation
 lang_iso=$(sed "s/zh-Hans/zh_Hans/g; s/pt-BR/pt_BR/g" <<<"$lang")
 
+# flags to consider (neither in use by default)
+#   cleanup-mode (was default) - this deleted any keys in localise not in clone
+#      remove this because we have 3 repos that are work in progress
+#   replace-modified (was not there) - given that we may have input from crowdin,
+#      we may need to use this to update to lokalise, but not sure how to handle this
 lokalise2 \
     --token $LOKALISE_TOKEN \
     --convert-placeholders=false \
     --project-id 414338966417c70d7055e2.75119857 \
     file upload \
     --file ${lang}.xliff \
-    --cleanup-mode \
     --lang-iso ${lang_iso}
 end
 
diff --git a/TidepoolService b/TidepoolService
@@ -1 +1 @@
-Subproject commit 84cab9b60e65b4aa814b0e12024a5e068ca65bfd
+Subproject commit b4fb9a0672f6e4a7bfed619fc3193b03a8a2ab79
diff --git 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.2
+LOOP_MARKETING_VERSION = 3.10.0
 CURRENT_PROJECT_VERSION = 57
