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/G7SensorKit b/G7SensorKit index 5139111ec6..77c6c8d7fd 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 5139111ec6aa8a098163eab424a3a65bda09b86a +Subproject commit 77c6c8d7fddc156debcaff2e7effe616988eeede 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..db9cf70d72 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 7bf62f5674fb5b8ced0dbebc7a98f9b06e586566 +Subproject commit db9cf70d7292803308e0e7f3c5f1f7fe6d801c9e diff --git a/LoopKit b/LoopKit index d28bbf334b..675854c9e9 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit d28bbf334b67f0289f84ebc855d8d295e5346766 +Subproject commit 675854c9e98a52ca9ac9f23837c313ceddcff414 diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index 20f167d456..addbd76dd3 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "f8d1e9c237647ab612da7f2bd3ae26946f39410508314c00cf54509a673f147e", + "originHash" : "c7399008e09b6313e9f722aa7a3b8f665a790816c6368c00e5666e7dfe76a2e8", "pins" : [ { "identity" : "amplitude-ios", diff --git a/MinimedKit b/MinimedKit index 411547825e..d52c0f8f1f 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit 411547825e3799d9a01f4d90f8cbf02f6e7ab7be +Subproject commit d52c0f8f1fe615760794fdac233ba78657449870 diff --git a/OmniBLE b/OmniBLE index d8375ebf24..a89cac3c22 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit d8375ebf242e0d0e02ace7a03d9e1632557de38e +Subproject commit a89cac3c22793bc852ea8598bd04870eda0c49d1 diff --git a/OmniKit b/OmniKit index 1a73635568..64731f0b31 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit 1a73635568750289ac4d2f702b6bf191efbdda9f +Subproject commit 64731f0b31d61cae14d00528a9c2bf78ea6da9a6 diff --git a/RileyLinkKit b/RileyLinkKit index c818fa8c90..83b211a442 160000 --- a/RileyLinkKit +++ b/RileyLinkKit @@ -1 +1 @@ -Subproject commit c818fa8c90c0c98a4ba26cd18dacfeed01cc2bd5 +Subproject commit 83b211a442672612e1790c2f0d393aeb23600b5f diff --git a/Scripts/manual_upload_to_lokalise.sh b/Scripts/manual_upload_to_lokalise.sh index 9ff9dd7f8e..a013c86d57 100755 --- 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 index 84cab9b60e..b4fb9a0672 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 84cab9b60e65b4aa814b0e12024a5e068ca65bfd +Subproject commit b4fb9a0672f6e4a7bfed619fc3193b03a8a2ab79 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