Merge pull request #45 from LoopKit/migrate-pumpmanagers-out

ps2 · web-flow · commit dc45cd39fd06 · 2023-03-20T13:48:26.000-05:00
Migrate pumpmanagers out
diff --git 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/AmplitudeService b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 8526982b8ed044f277003329bf537706d97222b2
+Subproject commit 5c77f20995eee141e00141065eff3579db430d9c
diff --git a/CGMBLEKit b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 28863fbd25a2139a036ef4848fdb7f22d90610e8
+Subproject commit 5a4beb4cd89699cfae2d93938659cc8414e16373
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 1dba808efcd629f2831b65c2a4d6967520b0ba95
+Subproject commit 30eb7f87b67347e6319a6517215fa6b8746d218e
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit 8924840243fffa5365bef26fac22b6e589f59197
+Subproject commit 9336301bc7d4768c8442c5edd8109441a30cd60d
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit c1116d92b338eafffa01b1a60fd1e46fe4ca2b8c
+Subproject commit 9965046312b18f983c7e22251dfe63e7204dfb94
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 84ae01a221543f3f1573d2ec4d4da3bb42bf9570
+Subproject commit 9835a29f1bac9f75023f39c376479a2e6a6c8ccd
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit 3e6eaf8e69fc5eb2cc5f35e7b023a147bd3faca4
+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,10 +140,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C136AA5D231187B0008A320D"
-               BuildableName = "MinimedKitPlugin.loopplugin"
-               BlueprintName = "MinimedKitPlugin"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
+               BlueprintIdentifier = "A99C713023396CB100AB9035"
+               BuildableName = "NightscoutServiceKitPlugin.loopplugin"
+               BlueprintName = "NightscoutServiceKitPlugin"
+               ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -154,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
@@ -168,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
@@ -425,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
@@ -485,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
@@ -535,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
diff --git a/MinimedKit b/MinimedKit
@@ -0,0 +1 @@
+Subproject commit 3ede47efd256513c372e9b356fff309f2b755c01
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
@@ -1 +1 @@
-Subproject commit 1e2b1f97c972196aa1704903bb501e501eec8ff2
+Subproject commit 68178a834e64eca04483a13af81f54911b4b40e2
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit e03b2ae741fd10937a17cb7b9b32f78069afef59
+Subproject commit 1196d9e3d659ef5e8788c760a6afacdc6f6b9009
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit 4bfebeab88689cc5f88d39b59d19092d2354cc5f
+Subproject commit 9cc9fbbf113848c42bd0aa4a2f1f865315ae1475
diff --git a/OmniKit b/OmniKit
@@ -0,0 +1 @@
+Subproject commit b35b29b0cedccd33d7297d5482300ab68b113c18
diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh
@@ -5,25 +5,26 @@ 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 -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/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 \
diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh
@@ -14,19 +14,20 @@ set -u
 date=`date`
 
 # Fetch translations from Lokalise
-rm -rf xliff
+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)
+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"
@@ -43,7 +44,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
 
diff --git 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
diff --git a/TidepoolKit b/TidepoolKit
@@ -1 +1 @@
-Subproject commit 1a097ec698cfa5e3e8edd34971aab66f99f874d8
+Subproject commit f551afa4ea7b770901385568f389b90b8e42a4d3
diff --git a/rileylink_ios b/rileylink_ios
@@ -1 +1 @@
-Subproject commit 60c5f0e236dd26a33cbf36d5b4faafd5b26bc947
+Subproject commit 6b2d3c45c6dfaeb6ea2a9da5111e7a2a5e2dc38e
