Merge dev into main for 3.2.1 release.

.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

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
@@ -439,16 +425,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
@@ -499,16 +475,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
@@ -549,6 +515,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

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",

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

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

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
+