From cac5090388bb103a76a1d8a818ed1e21f2067cab Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 17 Mar 2023 12:23:34 -0500 Subject: [PATCH 01/16] Update back to dev --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index a1fb919703..aa79bc6e4d 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit a1fb919703987bf5daad390f589fec3481953c33 +Subproject commit aa79bc6e4d59f9c3daa37efe829b7e96f9114643 From 2ed2bed88038555f8200b2096d509b5fcf6eb536 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 18 Mar 2023 11:39:44 -0500 Subject: [PATCH 02/16] Revert bad g7 localization changes --- G7SensorKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G7SensorKit b/G7SensorKit index 0ee0d3ba53..711988d3c6 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 0ee0d3ba53db9322f53fba27d8d17147fa800131 +Subproject commit 711988d3c6a759a6535166fc492db4ec47e80ff4 From 62a54d025f3705ed1ed92d0f7deb72605555bf79 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 18 Mar 2023 13:10:51 -0500 Subject: [PATCH 03/16] Localization cleanup --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index aa79bc6e4d..4469d3bb26 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit aa79bc6e4d59f9c3daa37efe829b7e96f9114643 +Subproject commit 4469d3bb2601fb4f2d4d69d8b1cba287987c6682 From 6376877772f3f0dbc89438d0c40624558395b85d Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 18 Mar 2023 13:49:11 -0500 Subject: [PATCH 04/16] Generally we want to run localization exports in cleanup mode --- Scripts/export_localizations.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index e02bace964..bb05c84a2b 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -26,5 +26,6 @@ foreach lang in $LANGUAGES --project-id 8069387863cdd837d11dd0.82955128 \ file upload \ --file ${lang}.xliff \ + --cleanup-mode \ --lang-iso ${lang_iso} end From d97b137854f53430ffd17833b7d3fbf13db036fe Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 18 Mar 2023 16:23:34 -0500 Subject: [PATCH 05/16] Translations import from Lokalise --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- .../AppIcon.appiconset/Contents.json | 14 ++++++ Scripts/import_localizations.sh | 45 ++++++++++++++----- TidepoolKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- rileylink_ios | 2 +- 17 files changed, 62 insertions(+), 27 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 2ee3b253fd..67d850fce3 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 2ee3b253fd240475010f45281e21439ca0f695a6 +Subproject commit 67d850fce3b10bf6d44be7579d1fafb4bf8fd7bf diff --git a/CGMBLEKit b/CGMBLEKit index 99dc051aff..924a1652b2 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 99dc051affd5cec5e31471491b5857d51699d740 +Subproject commit 924a1652b2076b470c5e0237423f2c14732a8217 diff --git a/G7SensorKit b/G7SensorKit index 711988d3c6..7354b64927 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 711988d3c6a759a6535166fc492db4ec47e80ff4 +Subproject commit 7354b64927c3bc5c3297e9dc6281e18d33809077 diff --git a/LogglyService b/LogglyService index 11c9875e62..1aadd223e4 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 11c9875e6298253e974d3caf0fd5d53b1efad024 +Subproject commit 1aadd223e4f0fec58d1c3e0a37fb558f333d44b9 diff --git a/Loop b/Loop index 4469d3bb26..6e992c2da0 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 4469d3bb2601fb4f2d4d69d8b1cba287987c6682 +Subproject commit 6e992c2da0f48717f2da81c76d0ce9101d0b6ceb diff --git a/LoopKit b/LoopKit index 6073eb1f4a..19c5d85b1e 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 6073eb1f4adaaeeb449589c21f251db2138b2c89 +Subproject commit 19c5d85b1e92b1f16a164dd551b2d19a051cac89 diff --git a/LoopOnboarding b/LoopOnboarding index 23e40a2576..22e3b162a8 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 23e40a2576ca60bb378ecadaf0e481c019d22aec +Subproject commit 22e3b162a8115950f8d9286b9b90ecca76330f66 diff --git a/LoopSupport b/LoopSupport index a3e89c0f5e..a700f47fa1 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit a3e89c0f5ed958f5ee76d655cb10a65de2d23a54 +Subproject commit a700f47fa16b0a09f139bf2e9cb8c3c9a62d191a diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 7a05935f95..2f07382484 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 7a05935f958887c938cef8d99ff94865d5daa2b5 +Subproject commit 2f07382484ab7183c1e648aa3d35b3144176fdc8 diff --git a/NightscoutService b/NightscoutService index 19daa23fa4..1847ac1177 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 19daa23fa411f542bfe48d7566997c027883b70b +Subproject commit 1847ac11778dbfe92c5e9bc4bf42b71b30092d1f diff --git a/OmniBLE b/OmniBLE index 41bd40f4f0..c50506c1a3 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 41bd40f4f0a074e60e0f9a763358a99519e43dcb +Subproject commit c50506c1a31d5bca2f648a3f011877b830afd52d diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json index cae5cd73d7..e41963c636 100644 --- a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json +++ b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json @@ -75,6 +75,13 @@ "size" : "51x51", "subtype" : "45mm" }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, { "filename" : "icon_86pt@2x.png", "idiom" : "watch", @@ -106,6 +113,13 @@ "size" : "117x117", "subtype" : "45mm" }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, { "filename" : "Icon.png", "idiom" : "watch-marketing", diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh index 2f542711a3..fa8adcce7f 100755 --- a/Scripts/import_localizations.sh +++ b/Scripts/import_localizations.sh @@ -14,6 +14,7 @@ set -u date=`date` # Fetch translations from Lokalise +rm -rf xliff lokalise2 \ --token "$LOKALISE_TOKEN" \ --project-id "8069387863cdd837d11dd0.82955128" \ @@ -25,32 +26,52 @@ lokalise2 \ --replace-breaks=false \ --unzip-to ./xliff +projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) + +for project in ${projects}; do + echo "Prepping $project" + IFS=":" read user dir branch <<< "$project" + echo "parts = $user $dir $branch" + cd $dir + git checkout $branch + git branch -D translations || true + cd - +done # Build Loop -set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Loop (Workspace)' build | xcpretty +set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' build | xcpretty # Apply translations foreach file in xliff/*.xliff - xcodebuild -workspace Loop.xcworkspace -scheme "Loop (Workspace)" -importLocalizations -localizationPath $file + xcodebuild -workspace LoopWorkspace.xcworkspace -scheme "LoopWorkspace" -importLocalizations -localizationPath $file end # Generate branches, commit and push. -projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) for project in ${projects}; do - echo "Working on $project" + echo "Commiting $project" IFS=":" read user dir branch <<< "$project" echo "parts = $user $dir $branch" cd $dir - set +e - git checkout -b translations + git checkout -b translations || true git add . - git commit -am "Updated translations from Lokalise on ${date}" - git push -f - pr=$(gh pr create -B $branch -R $user/$dir --fill 2>&1 | grep http) - echo "PR = $pr" - open $pr - cd .. + if git commit -am "Updated translations from Lokalise on ${date}"; then + git push -f + pr=$(gh pr create -B $branch -R $user/$dir --fill 2>&1 | grep http) + echo "PR = $pr" + open $pr + fi + cd - done +# Reset +#for project in ${projects}; do +# echo "Commiting $project" +# IFS=":" read user dir branch <<< "$project" +# echo "parts = $user $dir $branch" +# cd $dir +# git checkout $branch +# git pull +# cd - +#done diff --git a/TidepoolKit b/TidepoolKit index 5ec8e04e1b..f74b1f52eb 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 5ec8e04e1b8e8c14bf7237a96d86d87863b61f6d +Subproject commit f74b1f52ebf2171911835b4cf555137794d4ea9a diff --git a/TidepoolService b/TidepoolService index f31f515347..52dfdbb647 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit f31f5153479839533e40a5e3fc17bab87ba6f4f1 +Subproject commit 52dfdbb647e030134633b04e20ea40d27d00c467 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 7a0e3e92ed..7c19349823 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 7a0e3e92ed2485f6bf7eda97421a442484e056cd +Subproject commit 7c19349823fe6249e4a45a690bb63d2d5b6f21f1 diff --git a/rileylink_ios b/rileylink_ios index 8a68c41e2c..9d82f3e449 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 8a68c41e2ce05e47e1a5707d0c4ad05309bd3861 +Subproject commit 9d82f3e449632f7a0e81a72d3d4e298b880fb14c From 794c242db6cb472ec9f09d9ee0d670c492bf90b4 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 19 Mar 2023 13:04:14 -0500 Subject: [PATCH 06/16] Fix zh_Hans local id --- LoopKit | 2 +- .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 14 -------------- Scripts/export_localizations.sh | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/LoopKit b/LoopKit index 19c5d85b1e..6d470f019d 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 19c5d85b1e92b1f16a164dd551b2d19a051cac89 +Subproject commit 6d470f019d1f2fd2bf8de4eb735a35c0ecf50510 diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 88d49e15bd..49cba9ab4d 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -146,20 +146,6 @@ ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj"> - - - - Date: Sun, 19 Mar 2023 13:32:19 -0500 Subject: [PATCH 07/16] Update translations --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- Scripts/update_submodule_refs.sh | 14 ++++++++++++++ TidepoolKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- rileylink_ios | 2 +- 15 files changed, 28 insertions(+), 14 deletions(-) create mode 100755 Scripts/update_submodule_refs.sh diff --git a/AmplitudeService b/AmplitudeService index 67d850fce3..8526982b8e 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 67d850fce3b10bf6d44be7579d1fafb4bf8fd7bf +Subproject commit 8526982b8ed044f277003329bf537706d97222b2 diff --git a/CGMBLEKit b/CGMBLEKit index 924a1652b2..28863fbd25 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 924a1652b2076b470c5e0237423f2c14732a8217 +Subproject commit 28863fbd25a2139a036ef4848fdb7f22d90610e8 diff --git a/G7SensorKit b/G7SensorKit index 7354b64927..1dba808efc 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 7354b64927c3bc5c3297e9dc6281e18d33809077 +Subproject commit 1dba808efcd629f2831b65c2a4d6967520b0ba95 diff --git a/LogglyService b/LogglyService index 1aadd223e4..8924840243 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 1aadd223e4f0fec58d1c3e0a37fb558f333d44b9 +Subproject commit 8924840243fffa5365bef26fac22b6e589f59197 diff --git a/Loop b/Loop index 6e992c2da0..c1116d92b3 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 6e992c2da0f48717f2da81c76d0ce9101d0b6ceb +Subproject commit c1116d92b338eafffa01b1a60fd1e46fe4ca2b8c diff --git a/LoopKit b/LoopKit index 6d470f019d..84ae01a221 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 6d470f019d1f2fd2bf8de4eb735a35c0ecf50510 +Subproject commit 84ae01a221543f3f1573d2ec4d4da3bb42bf9570 diff --git a/LoopOnboarding b/LoopOnboarding index 22e3b162a8..135158ba71 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 22e3b162a8115950f8d9286b9b90ecca76330f66 +Subproject commit 135158ba71f4cd004ec9a7719ceff6fa262c7691 diff --git a/LoopSupport b/LoopSupport index a700f47fa1..3e6eaf8e69 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit a700f47fa16b0a09f139bf2e9cb8c3c9a62d191a +Subproject commit 3e6eaf8e69fc5eb2cc5f35e7b023a147bd3faca4 diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 2f07382484..1e2b1f97c9 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 2f07382484ab7183c1e648aa3d35b3144176fdc8 +Subproject commit 1e2b1f97c972196aa1704903bb501e501eec8ff2 diff --git a/NightscoutService b/NightscoutService index 1847ac1177..e03b2ae741 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 1847ac11778dbfe92c5e9bc4bf42b71b30092d1f +Subproject commit e03b2ae741fd10937a17cb7b9b32f78069afef59 diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh new file mode 100755 index 0000000000..081544bf49 --- /dev/null +++ b/Scripts/update_submodule_refs.sh @@ -0,0 +1,14 @@ +#!/bin/zsh + +projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) + +for project in ${projects}; do + echo "Prepping $project" + IFS=":" read user dir branch <<< "$project" + echo "parts = $user $dir $branch" + cd $dir + git checkout $branch + git pull + cd - +done + diff --git a/TidepoolKit b/TidepoolKit index f74b1f52eb..1a097ec698 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit f74b1f52ebf2171911835b4cf555137794d4ea9a +Subproject commit 1a097ec698cfa5e3e8edd34971aab66f99f874d8 diff --git a/TidepoolService b/TidepoolService index 52dfdbb647..ea68eef39b 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 52dfdbb647e030134633b04e20ea40d27d00c467 +Subproject commit ea68eef39b3d5e51d315f7d1fd1428cad8fbe88c diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 7c19349823..20ed7a1457 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 7c19349823fe6249e4a45a690bb63d2d5b6f21f1 +Subproject commit 20ed7a1457af2e5a72fcc1c91b660ae8c0478d94 diff --git a/rileylink_ios b/rileylink_ios index 9d82f3e449..60c5f0e236 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 9d82f3e449632f7a0e81a72d3d4e298b880fb14c +Subproject commit 60c5f0e236dd26a33cbf36d5b4faafd5b26bc947 From 65048efe37e21ee64bb665482a5a30a8371782b9 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 19 Mar 2023 13:39:26 -0500 Subject: [PATCH 08/16] Update OmniBLE translations --- OmniBLE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE b/OmniBLE index c50506c1a3..4bfebeab88 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit c50506c1a31d5bca2f648a3f011877b830afd52d +Subproject commit 4bfebeab88689cc5f88d39b59d19092d2354cc5f From 6387c5cbba8151c5ebbd1b5c222bbda75b900a18 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 19 Mar 2023 14:57:58 -0500 Subject: [PATCH 09/16] match onboarding order to therapy setting screen order --- LoopOnboarding | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopOnboarding b/LoopOnboarding index 135158ba71..308097ae90 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 135158ba71f4cd004ec9a7719ceff6fa262c7691 +Subproject commit 308097ae9066b3f1336cfc113c3e85dda329a3a6 From 478874764aa80195aebe2f7a5366033749a0735b Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 19 Mar 2023 20:45:50 -0500 Subject: [PATCH 10/16] Migrate OmniKit and MinimedKit out into their own repos --- .gitmodules | 6 ++ G7SensorKit | 2 +- .../contents.xcworkspacedata | 6 ++ .../xcschemes/LoopWorkspace.xcscheme | 60 +++++++++---------- MinimedKit | 1 + OmniKit | 1 + rileylink_ios | 2 +- 7 files changed, 46 insertions(+), 32 deletions(-) create mode 160000 MinimedKit create mode 160000 OmniKit diff --git a/.gitmodules b/.gitmodules index fd3101427e..5df7f69a9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,9 @@ [submodule "TidepoolKit"] path = TidepoolKit url = https://github.com/LoopKit/TidepoolKit.git +[submodule "OmniKit"] + path = OmniKit + url = https://github.com/LoopKit/OmniKit.git +[submodule "MinimedKit"] + path = MinimedKit + url = https://github.com/LoopKit/MinimedKit.git diff --git a/G7SensorKit b/G7SensorKit index 1dba808efc..c3520a9a20 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 1dba808efcd629f2831b65c2a4d6967520b0ba95 +Subproject commit c3520a9a20184a7170dbb2def63b1f98794fbe79 diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 2b1c12fc70..d6870b0833 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -65,6 +65,12 @@ + + + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 49cba9ab4d..00fa61ad1a 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -140,10 +140,10 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "A99C713023396CB100AB9035" + BuildableName = "NightscoutServiceKitPlugin.loopplugin" + BlueprintName = "NightscoutServiceKitPlugin" + ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj"> + BlueprintIdentifier = "C1E34B5A29C7AD01009A50A5" + BuildableName = "MinimedKitPlugin.loopplugin" + BlueprintName = "MinimedKitPlugin" + ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj"> + ReferencedContainer = "container:OmniKit/OmniKit.xcodeproj"> - - - - - - - - + + + + + + + + Date: Sun, 19 Mar 2023 23:36:25 -0500 Subject: [PATCH 11/16] Update scripts with new repos --- Scripts/export_localizations.sh | 2 +- Scripts/import_localizations.sh | 4 ++-- Scripts/update_submodule_refs.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index 66343f7c8c..efbb2a5291 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -23,7 +23,7 @@ foreach lang in $LANGUAGES lokalise2 \ --token $LOKALISE_TOKEN \ - --project-id 8069387863cdd837d11dd0.82955128 \ + --project-id 414338966417c70d7055e2.75119857 \ file upload \ --file ${lang}.xliff \ --cleanup-mode \ diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh index fa8adcce7f..180650006c 100755 --- a/Scripts/import_localizations.sh +++ b/Scripts/import_localizations.sh @@ -17,7 +17,7 @@ date=`date` rm -rf xliff lokalise2 \ --token "$LOKALISE_TOKEN" \ - --project-id "8069387863cdd837d11dd0.82955128" \ + --project-id "414338966417c70d7055e2.75119857" \ file download \ --format xliff \ --bundle-structure "%LANG_ISO%.%FORMAT%" \ @@ -26,7 +26,7 @@ lokalise2 \ --replace-breaks=false \ --unzip-to ./xliff -projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) +projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev LoopKit:OmniKit:main LoopKit:MinimedKit:main) for project in ${projects}; do echo "Prepping $project" diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh index 081544bf49..fe24d7f015 100755 --- a/Scripts/update_submodule_refs.sh +++ b/Scripts/update_submodule_refs.sh @@ -1,11 +1,11 @@ #!/bin/zsh -projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) +projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev LoopKit:OmniKit:main LoopKit:MinimedKit:main) for project in ${projects}; do - echo "Prepping $project" + echo "Updating to $project" IFS=":" read user dir branch <<< "$project" - echo "parts = $user $dir $branch" + echo "Updating to $branch on $user/$project" cd $dir git checkout $branch git pull From 914382e16ffa3dc2ab8ecb3b80c44153451a7cd9 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Mar 2023 00:11:40 -0500 Subject: [PATCH 12/16] Separate in/out xliff directories, and do not convert placeholders on upload --- Scripts/export_localizations.sh | 7 ++++--- Scripts/import_localizations.sh | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index efbb2a5291..811a54d3f8 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -12,10 +12,10 @@ IFS=" "; args=( $=argstring ) xcodebuild -scheme LoopWorkspace -exportLocalizations -localizationPath xclocs $args -mkdir -p xliff -find xclocs -name '*.xliff' -exec cp {} xliff \; +mkdir -p xliff_out +find xclocs -name '*.xliff' -exec cp {} xliff_out \; -cd xliff +cd xliff_out foreach lang in $LANGUAGES @@ -23,6 +23,7 @@ foreach lang in $LANGUAGES lokalise2 \ --token $LOKALISE_TOKEN \ + --convert-placeholders false \ --project-id 414338966417c70d7055e2.75119857 \ file upload \ --file ${lang}.xliff \ diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh index 180650006c..38f21f6d52 100755 --- a/Scripts/import_localizations.sh +++ b/Scripts/import_localizations.sh @@ -14,7 +14,7 @@ set -u date=`date` # Fetch translations from Lokalise -rm -rf xliff +rm -rf xliff_in lokalise2 \ --token "$LOKALISE_TOKEN" \ --project-id "414338966417c70d7055e2.75119857" \ @@ -24,7 +24,7 @@ lokalise2 \ --original-filenames=false \ --export-empty-as skip \ --replace-breaks=false \ - --unzip-to ./xliff + --unzip-to ./xliff_in projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev LoopKit:OmniKit:main LoopKit:MinimedKit:main) @@ -43,7 +43,7 @@ set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme # Apply translations -foreach file in xliff/*.xliff +foreach file in xliff_in/*.xliff xcodebuild -workspace LoopWorkspace.xcworkspace -scheme "LoopWorkspace" -importLocalizations -localizationPath $file end From 1f086016c88039495e542eb6733929e0b5374125 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Mar 2023 01:21:12 -0500 Subject: [PATCH 13/16] Do not convert placeholders on upload --- Scripts/export_localizations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index 811a54d3f8..f4fce81768 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -23,7 +23,7 @@ foreach lang in $LANGUAGES lokalise2 \ --token $LOKALISE_TOKEN \ - --convert-placeholders false \ + --convert-placeholders=false \ --project-id 414338966417c70d7055e2.75119857 \ file upload \ --file ${lang}.xliff \ From 40ce8357d04df91ff27be5a2f258a077313c40c6 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Mar 2023 12:28:52 -0500 Subject: [PATCH 14/16] Fix missing cs locale during export --- Scripts/export_localizations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index f4fce81768..46619d2bc1 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -5,7 +5,7 @@ set -u : "$LOKALISE_TOKEN" -LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) +LANGUAGES=(ar cs ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) argstring="${LANGUAGES[@]/#/-exportLanguage }" IFS=" "; args=( $=argstring ) From 5ffed7bcda3b81990b1b8cf3078a2ba7439c637d Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Mar 2023 13:38:22 -0500 Subject: [PATCH 15/16] Update submodules to latest --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopSupport | 2 +- MinimedKit | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- OmniKit | 2 +- Scripts/import_localizations.sh | 1 + TidepoolKit | 2 +- rileylink_ios | 2 +- 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 8526982b8e..5c77f20995 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 8526982b8ed044f277003329bf537706d97222b2 +Subproject commit 5c77f20995eee141e00141065eff3579db430d9c diff --git a/CGMBLEKit b/CGMBLEKit index 28863fbd25..5a4beb4cd8 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit 28863fbd25a2139a036ef4848fdb7f22d90610e8 +Subproject commit 5a4beb4cd89699cfae2d93938659cc8414e16373 diff --git a/G7SensorKit b/G7SensorKit index c3520a9a20..30eb7f87b6 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit c3520a9a20184a7170dbb2def63b1f98794fbe79 +Subproject commit 30eb7f87b67347e6319a6517215fa6b8746d218e diff --git a/LogglyService b/LogglyService index 8924840243..9336301bc7 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 8924840243fffa5365bef26fac22b6e589f59197 +Subproject commit 9336301bc7d4768c8442c5edd8109441a30cd60d diff --git a/Loop b/Loop index c1116d92b3..9965046312 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit c1116d92b338eafffa01b1a60fd1e46fe4ca2b8c +Subproject commit 9965046312b18f983c7e22251dfe63e7204dfb94 diff --git a/LoopKit b/LoopKit index 84ae01a221..9835a29f1b 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 84ae01a221543f3f1573d2ec4d4da3bb42bf9570 +Subproject commit 9835a29f1bac9f75023f39c376479a2e6a6c8ccd diff --git a/LoopSupport b/LoopSupport index 3e6eaf8e69..40362a12e3 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 3e6eaf8e69fc5eb2cc5f35e7b023a147bd3faca4 +Subproject commit 40362a12e3e73e40ffadef5a1252d100c5761e8e diff --git a/MinimedKit b/MinimedKit index ae7c8fa426..3ede47efd2 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit ae7c8fa4265b2843005a8bd0bfcd4f96859a2ad8 +Subproject commit 3ede47efd256513c372e9b356fff309f2b755c01 diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 1e2b1f97c9..68178a834e 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 1e2b1f97c972196aa1704903bb501e501eec8ff2 +Subproject commit 68178a834e64eca04483a13af81f54911b4b40e2 diff --git a/NightscoutService b/NightscoutService index e03b2ae741..1196d9e3d6 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit e03b2ae741fd10937a17cb7b9b32f78069afef59 +Subproject commit 1196d9e3d659ef5e8788c760a6afacdc6f6b9009 diff --git a/OmniBLE b/OmniBLE index 4bfebeab88..9cc9fbbf11 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 4bfebeab88689cc5f88d39b59d19092d2354cc5f +Subproject commit 9cc9fbbf113848c42bd0aa4a2f1f865315ae1475 diff --git a/OmniKit b/OmniKit index aa726002d1..b35b29b0ce 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit aa726002d1fe546cd8aa0f761aaf95a78c5aff47 +Subproject commit b35b29b0cedccd33d7297d5482300ab68b113c18 diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh index 38f21f6d52..3eb54a5a3e 100755 --- a/Scripts/import_localizations.sh +++ b/Scripts/import_localizations.sh @@ -22,6 +22,7 @@ lokalise2 \ --format xliff \ --bundle-structure "%LANG_ISO%.%FORMAT%" \ --original-filenames=false \ + --placeholder-format ios \ --export-empty-as skip \ --replace-breaks=false \ --unzip-to ./xliff_in diff --git a/TidepoolKit b/TidepoolKit index 1a097ec698..f551afa4ea 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 1a097ec698cfa5e3e8edd34971aab66f99f874d8 +Subproject commit f551afa4ea7b770901385568f389b90b8e42a4d3 diff --git a/rileylink_ios b/rileylink_ios index 1193131dae..6b2d3c45c6 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 1193131dae8aa63a4bc68238c9bfe97069d34757 +Subproject commit 6b2d3c45c6dfaeb6ea2a9da5111e7a2a5e2dc38e From edc7a28396008ea029d3241f6b4755b6fcd236a9 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Mar 2023 18:10:03 -0500 Subject: [PATCH 16/16] Update submodules to latest --- G7SensorKit | 2 +- Loop | 2 +- MinimedKit | 2 +- OmniBLE | 2 +- OmniKit | 2 +- TidepoolKit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/G7SensorKit b/G7SensorKit index 30eb7f87b6..14205c1f1f 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 30eb7f87b67347e6319a6517215fa6b8746d218e +Subproject commit 14205c1f1f16ecc3434d6c7f3f349a76176cb7f2 diff --git a/Loop b/Loop index 9965046312..0ea36c6546 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 9965046312b18f983c7e22251dfe63e7204dfb94 +Subproject commit 0ea36c654625915d8ab8f1dc261f084f294bb898 diff --git a/MinimedKit b/MinimedKit index 3ede47efd2..8491926568 160000 --- a/MinimedKit +++ b/MinimedKit @@ -1 +1 @@ -Subproject commit 3ede47efd256513c372e9b356fff309f2b755c01 +Subproject commit 84919265689737292c3a18dfa0ff9113d69a6e7d diff --git a/OmniBLE b/OmniBLE index 9cc9fbbf11..f21360781c 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 9cc9fbbf113848c42bd0aa4a2f1f865315ae1475 +Subproject commit f21360781c0b8eee26c531d20f1b0aa192a227f2 diff --git a/OmniKit b/OmniKit index b35b29b0ce..c1e0d39597 160000 --- a/OmniKit +++ b/OmniKit @@ -1 +1 @@ -Subproject commit b35b29b0cedccd33d7297d5482300ab68b113c18 +Subproject commit c1e0d395975c93d15b3f84ac21097e40b7d5d93f diff --git a/TidepoolKit b/TidepoolKit index f551afa4ea..b410a88ab8 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit f551afa4ea7b770901385568f389b90b8e42a4d3 +Subproject commit b410a88ab85bf3f1311170f08604fa1ede904c2e