diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 8a507fe32b..db33b8991b 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -98,7 +98,7 @@ jobs: - name: Sync upstream changes if: | # do not run the upstream sync action on the upstream repository steps.workflow-permission.outputs.has_permission == 'true' && - vars.SCHEDULED_SYNC != 'false' && github.repository_owner != 'loopandlearn' + vars.SCHEDULED_SYNC != 'false' && github.repository_owner != 'LoopKit' id: sync uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1 with: diff --git a/Gemfile b/Gemfile index f89fa7fe55..25d03dc286 100644 --- 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" \ No newline at end of file +gem "fastlane", "2.230.0" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 2ecc546e4b..4811b4bd87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,3 @@ -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: @@ -53,6 +5,7 @@ GEM base64 nkf rexml + abbrev (0.1.2) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) @@ -77,13 +30,14 @@ GEM aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.3.0) + base64 (0.2.0) bigdecimal (3.2.3) 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) @@ -120,6 +74,54 @@ GEM 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) @@ -234,8 +236,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - fastlane! - rexml (>= 3.4.2) + fastlane (= 2.230.0) BUNDLED WITH 2.6.2 diff --git a/LibreTransmitter b/LibreTransmitter index 25c31bae22..38cc483f3d 160000 --- a/LibreTransmitter +++ b/LibreTransmitter @@ -1 +1 @@ -Subproject commit 25c31bae22082caaa6823179010129912d6c8f8f +Subproject commit 38cc483f3d7716735ceee6e57b6ed4dd68eaf1d0 diff --git a/Loop b/Loop index 7bf62f5674..e92405839a 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 7bf62f5674fb5b8ced0dbebc7a98f9b06e586566 +Subproject commit e92405839a43356e9876f0cfbb6353b4fb248a54 diff --git a/OmniBLE b/OmniBLE index d8375ebf24..4ad75d62bd 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit d8375ebf242e0d0e02ace7a03d9e1632557de38e +Subproject commit 4ad75d62bdbfd7d6df4d2aac03e7396a3d0ef175 diff --git a/OmniKit b/OmniKit index 1a73635568..89840fb27e 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 1a73635568750289ac4d2f702b6bf191efbdda9f +Subproject commit 89840fb27e5211cb2bbd5a78af1a03295a6c335e diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig index 7687dc64d0..d399f12020 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.9.3 +LOOP_MARKETING_VERSION = 3.9.4 CURRENT_PROJECT_VERSION = 57