From 2025487e8330d70e0c9e192a5305c62a450dce80 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 13 Jun 2025 06:08:12 -0700 Subject: [PATCH 1/6] update to fastlane 2.228.0 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6ab3602f..abb8fc41d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,26 +9,26 @@ GEM public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.2) - aws-partitions (1.1086.0) - aws-sdk-core (3.222.1) + aws-eventstream (1.4.0) + aws-partitions (1.1115.0) + aws-sdk-core (3.225.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.99.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (1.104.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.183.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.189.1) + aws-sdk-core (~> 3, >= 3.225.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.2.0) + base64 (0.3.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -70,7 +70,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.1) + fastlane (2.228.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -157,7 +157,7 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.10.2) + json (2.12.2) jwt (2.10.1) base64 logger (1.7.0) @@ -167,13 +167,13 @@ GEM multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) - naturally (2.2.1) + naturally (2.2.2) nkf (0.2.0) optparse (0.6.0) os (1.1.4) plist (3.7.2) - public_suffix (6.0.1) - rake (13.2.1) + public_suffix (6.0.2) + rake (13.3.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -184,7 +184,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.4.1) security (0.1.5) - signet (0.19.0) + signet (0.20.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) From a716b69c829a2d170871e94fa47263621d8e7232 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 13 Jun 2025 06:16:03 -0700 Subject: [PATCH 2/6] Bump main version to 3.6.1 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index bbf640a06..f83e8afae 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.6.0 +LOOP_MARKETING_VERSION = 3.6.1 CURRENT_PROJECT_VERSION = 57 From d7895ef1a1248ebacf49e11668ecbe04e02e554a Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 20 Jun 2025 16:57:35 -0400 Subject: [PATCH 3/6] Fix Add Identifiers for main branch using files from PR 285, dev branch --- Gemfile | 5 ++- Gemfile.lock | 98 +++++++++++++++++++++++++---------------------- fastlane/Fastfile | 14 ++++--- 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index 7a118b49b..6d8667c81 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source "https://rubygems.org" -gem "fastlane" +# gem "fastlane" + +# This branch uses fastlane 2.228.0 plus pr 29596 +gem "fastlane", git: "https://github.com/loopandlearn/fastlane.git", ref: "a670d4b092b274d58ebb5497126e47fc6a84f533" diff --git a/Gemfile.lock b/Gemfile.lock index abb8fc41d..d10e9b9f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,51 @@ +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: @@ -10,7 +58,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.4.0) - aws-partitions (1.1115.0) + aws-partitions (1.1116.0) aws-sdk-core (3.225.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -18,7 +66,7 @@ GEM base64 jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.104.0) + aws-sdk-kms (1.105.0) aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) aws-sdk-s3 (1.189.1) @@ -70,48 +118,6 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - 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) fastlane-sirp (1.0.0) sysrandom (~> 1.0) gh_inspector (1.1.3) @@ -167,7 +173,7 @@ GEM multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) - naturally (2.2.2) + naturally (2.3.0) nkf (0.2.0) optparse (0.6.0) os (1.1.4) @@ -226,7 +232,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - fastlane + fastlane! BUNDLED WITH 2.6.2 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e71a3ee16..6b632d958 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -171,10 +171,15 @@ platform :ios do ) def configure_bundle_id(name, identifier, capabilities) - bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(name: name, identifier: identifier) - capabilities.each { |capability| - bundle_id.create_capability(capability) - } + bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create( + name: name, + identifier: identifier, + platform: "IOS" + ) + existing = bundle_id.get_capabilities.map(&:capability_type) + capabilities.reject { |c| existing.include?(c) }.each do |cap| + bundle_id.create_capability(cap) + end end configure_bundle_id("Loop", "com.#{TEAMID}.loopkit.Loop", [ @@ -182,7 +187,6 @@ platform :ios do Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT, Spaceship::ConnectAPI::BundleIdCapability::Type::PUSH_NOTIFICATIONS, Spaceship::ConnectAPI::BundleIdCapability::Type::SIRIKIT, - Spaceship::ConnectAPI::BundleIdCapability::Type::USERNOTIFICATIONS_TIMESENSITIVE, Spaceship::ConnectAPI::BundleIdCapability::Type::NFC_TAG_READING ]) From c913b6ff2c530f1190a4044eae73142f0410edb4 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 20 Jun 2025 17:02:37 -0400 Subject: [PATCH 4/6] Bump main version to 3.6.2 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index f83e8afae..6983346ce 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.6.1 +LOOP_MARKETING_VERSION = 3.6.2 CURRENT_PROJECT_VERSION = 57 From 014feec00cf15628b3f3a66a1ede2bfd1108a030 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Mon, 7 Jul 2025 11:50:06 -0700 Subject: [PATCH 5/6] update OmniXXX: add fix to handle interrupted bolus fault correctly --- OmniBLE | 2 +- OmniKit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE b/OmniBLE index 6f65cbae4..97fe52f1a 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 6f65cbae4c8089a892911e273204edfc4cc81e9d +Subproject commit 97fe52f1a43edad69a80fccce5fddb10cc813b3d diff --git a/OmniKit b/OmniKit index 92948a768..12058d3d0 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 92948a7684ec382714becc53c643a1617597bb37 +Subproject commit 12058d3d0394cd4269468513d838e570faf5853b From e58d5f3781721b2695f059809f7c5bdf1ca4f93a Mon Sep 17 00:00:00 2001 From: marionbarker Date: Mon, 7 Jul 2025 11:50:48 -0700 Subject: [PATCH 6/6] Bump main version to 3.6.3 --- VersionOverride.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index 6983346ce..4ae28422d 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.6.2 +LOOP_MARKETING_VERSION = 3.6.3 CURRENT_PROJECT_VERSION = 57