Merge branch 'main' into main_lnl_patches_3.2.1

marionbarker · marionbarker · commit 0572f51371e7 · 2023-03-20T23:33:41.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -60,3 +60,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/AmplitudeService b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 2ee3b253fd240475010f45281e21439ca0f695a6
+Subproject commit 5c77f20995eee141e00141065eff3579db430d9c
diff --git a/CGMBLEKit b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 99dc051affd5cec5e31471491b5857d51699d740
+Subproject commit 5a4beb4cd89699cfae2d93938659cc8414e16373
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 0ee0d3ba53db9322f53fba27d8d17147fa800131
+Subproject commit 14205c1f1f16ecc3434d6c7f3f349a76176cb7f2
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit 11c9875e6298253e974d3caf0fd5d53b1efad024
+Subproject commit 9336301bc7d4768c8442c5edd8109441a30cd60d
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit 2e0940972923b2c12ea78124520caaa11ddf70a3
+Subproject commit 92b247950577bc55adae231650055f2542eb589d
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 9b0295858528bdedf2a64bff0ca94c461c6a6ea8
+Subproject commit dcb859620e1399aba02d8f18be0d0637f0744ef2
diff --git a/LoopOnboarding b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 23e40a2576ca60bb378ecadaf0e481c019d22aec
+Subproject commit 308097ae9066b3f1336cfc113c3e85dda329a3a6
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit a3e89c0f5ed958f5ee76d655cb10a65de2d23a54
+Subproject commit 40362a12e3e73e40ffadef5a1252d100c5761e8e
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -140,24 +140,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C136AA5D231187B0008A320D"
-               BuildableName = "MinimedKitPlugin.loopplugin"
-               BlueprintName = "MinimedKitPlugin"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C1B3830A1CD0665D00CE7782"
-               BuildableName = "NightscoutUploadKit.framework"
-               BlueprintName = "NightscoutUploadKit"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
+               BlueprintIdentifier = "A99C713023396CB100AB9035"
+               BuildableName = "NightscoutServiceKitPlugin.loopplugin"
+               BlueprintName = "NightscoutServiceKitPlugin"
+               ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -168,10 +154,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A99C713023396CB100AB9035"
-               BuildableName = "NightscoutServiceKitPlugin.loopplugin"
-               BlueprintName = "NightscoutServiceKitPlugin"
-               ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
+               BlueprintIdentifier = "C1E34B5A29C7AD01009A50A5"
+               BuildableName = "MinimedKitPlugin.loopplugin"
+               BlueprintName = "MinimedKitPlugin"
+               ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -182,10 +168,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C136AA2923116E32008A320D"
+               BlueprintIdentifier = "C124021629C7D93D00B32844"
                BuildableName = "OmniKitPlugin.loopplugin"
                BlueprintName = "OmniKitPlugin"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
+               ReferencedContainer = "container:OmniKit/OmniKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -467,16 +453,6 @@
                ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C10D9BC91C8269D500378342"
-               BuildableName = "MinimedKitTests.xctest"
-               BlueprintName = "MinimedKitTests"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
@@ -527,16 +503,6 @@
                ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C1FFAF7F213323CC00C50C1D"
-               BuildableName = "OmniKitTests.xctest"
-               BlueprintName = "OmniKitTests"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
@@ -577,6 +543,26 @@
                ReferencedContainer = "container:G7SensorKit/G7SensorKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C13CC34029C7B73A007F25DE"
+               BuildableName = "MinimedKitTests.xctest"
+               BlueprintName = "MinimedKitTests"
+               ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C12ED9C929C7DBA900435701"
+               BuildableName = "OmniKitTests.xctest"
+               BlueprintName = "OmniKitTests"
+               ReferencedContainer = "container:OmniKit/OmniKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/MinimedKit b/MinimedKit
@@ -0,0 +1 @@
+Subproject commit f7b4cf5eb1cf916b77794dce28dc03db73d26931
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
@@ -1 +1 @@
-Subproject commit 7a05935f958887c938cef8d99ff94865d5daa2b5
+Subproject commit 68178a834e64eca04483a13af81f54911b4b40e2
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit 19daa23fa411f542bfe48d7566997c027883b70b
+Subproject commit 1196d9e3d659ef5e8788c760a6afacdc6f6b9009
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit 41bd40f4f0a074e60e0f9a763358a99519e43dcb
+Subproject commit f21360781c0b8eee26c531d20f1b0aa192a227f2
diff --git a/OmniKit b/OmniKit
@@ -0,0 +1 @@
+Subproject commit c1e0d395975c93d15b3f84ac21097e40b7d5d93f
diff --git 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/export_localizations.sh b/Scripts/export_localizations.sh
@@ -5,26 +5,28 @@ 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 )
 
-xcodebuild -exportLocalizations -localizationPath xclocs $args
+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
 
-  lang_iso=$(sed "s/zh-Hans/zh_Hans_CN/g; s/pt-BR/pt_BR/g" <<<"$lang")
+  lang_iso=$(sed "s/zh-Hans/zh_Hans/g; s/pt-BR/pt_BR/g" <<<"$lang")
 
   lokalise2 \
     --token $LOKALISE_TOKEN \
-    --project-id 8069387863cdd837d11dd0.82955128 \
+    --convert-placeholders=false \
+    --project-id 414338966417c70d7055e2.75119857 \
     file upload \
     --file ${lang}.xliff \
+    --cleanup-mode \
     --lang-iso ${lang_iso}
 end
diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh
@@ -14,43 +14,65 @@ set -u
 date=`date`
 
 # Fetch translations from Lokalise
+rm -rf xliff_in
 lokalise2 \
     --token "$LOKALISE_TOKEN" \
-    --project-id "8069387863cdd837d11dd0.82955128" \
+    --project-id "414338966417c70d7055e2.75119857" \
     file download \
     --format xliff \
     --bundle-structure "%LANG_ISO%.%FORMAT%" \
     --original-filenames=false \
+    --placeholder-format ios \
     --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)
+
+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
+foreach file in xliff_in/*.xliff
+  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/Scripts/update_submodule_refs.sh 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 LoopKit:OmniKit:main LoopKit:MinimedKit:main)
+
+for project in ${projects}; do
+  echo "Updating to $project"
+  IFS=":" read user dir branch <<< "$project"
+  echo "Updating to $branch on $user/$project"
+  cd $dir
+  git checkout $branch
+  git pull
+  cd -
+done
+
diff --git a/TidepoolKit b/TidepoolKit
@@ -1 +1 @@
-Subproject commit 5ec8e04e1b8e8c14bf7237a96d86d87863b61f6d
+Subproject commit b410a88ab85bf3f1311170f08604fa1ede904c2e
diff --git a/TidepoolService b/TidepoolService
@@ -1 +1 @@
-Subproject commit f31f5153479839533e40a5e3fc17bab87ba6f4f1
+Subproject commit ea68eef39b3d5e51d315f7d1fd1428cad8fbe88c
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit 7a0e3e92ed2485f6bf7eda97421a442484e056cd
+Subproject commit 20ed7a1457af2e5a72fcc1c91b660ae8c0478d94
diff --git a/rileylink_ios b/rileylink_ios
@@ -1 +1 @@
-Subproject commit 8a68c41e2ce05e47e1a5707d0c4ad05309bd3861
+Subproject commit 6b2d3c45c6dfaeb6ea2a9da5111e7a2a5e2dc38e
