From 8f58a6fad9ae21efbfb239835e375b6ed1dfc682 Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Sat, 12 Mar 2022 14:49:42 -0600
Subject: [PATCH 1/4] Update NightscoutService and build order

---
 .../xcshareddata/swiftpm/Package.resolved     |  9 +++
 .../xcschemes/Loop (Workspace).xcscheme       | 60 +++++++++----------
 LoopOnboarding                                |  2 +-
 NightscoutService                             |  2 +-
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved
index f100b48b43..631323166f 100644
--- a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -9,6 +9,15 @@
           "revision": "4b0565384d3c4c588af09e660535b2c7c9bf5b39",
           "version": "1.4.2"
         }
+      },
+      {
+        "package": "OneTimePassword",
+        "repositoryURL": "https://github.com/mattrubin/OneTimePassword",
+        "state": {
+          "branch": null,
+          "revision": "8e4022f2852d77240d0a17482cbfe325354aac70",
+          "version": null
+        }
       }
     ]
   },
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
index 03a0a1ea3d..dd841e868e 100644
--- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme	
+++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme	
@@ -3,8 +3,8 @@
    LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
-      buildImplicitDependencies = "NO">
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -132,6 +132,34 @@
                ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "12C972CA24105C3600E9CDDB"
+               BuildableName = "Amplitude.framework"
+               BlueprintName = "Amplitude_iOS"
+               ReferencedContainer = "container:Amplitude-iOS/Amplitude.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A9FC98DB2333EFE10010CBD2"
+               BuildableName = "AmplitudeServiceKitPlugin.loopplugin"
+               BlueprintName = "AmplitudeServiceKitPlugin"
+               ReferencedContainer = "container:AmplitudeService/AmplitudeService.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -230,34 +258,6 @@
                ReferencedContainer = "container:dexcom-share-client-swift/ShareClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "12C972CA24105C3600E9CDDB"
-               BuildableName = "Amplitude.framework"
-               BlueprintName = "Amplitude_iOS"
-               ReferencedContainer = "container:Amplitude-iOS/Amplitude.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A9FC98DB2333EFE10010CBD2"
-               BuildableName = "AmplitudeServiceKitPlugin.loopplugin"
-               BlueprintName = "AmplitudeServiceKitPlugin"
-               ReferencedContainer = "container:AmplitudeService/AmplitudeService.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/LoopOnboarding b/LoopOnboarding
index 7ceeb05454..2ebcf2bb9a 160000
--- a/LoopOnboarding
+++ b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 7ceeb05454dd083a277efb2f4b0ec525bcc19512
+Subproject commit 2ebcf2bb9adbfd2f2dfa777da744fd65b46510fe
diff --git a/NightscoutService b/NightscoutService
index 7bb14056e6..a9f6e6f77d 160000
--- a/NightscoutService
+++ b/NightscoutService
@@ -1 +1 @@
-Subproject commit 7bb14056e62a49e4574b3e8f1648231223cd0a48
+Subproject commit a9f6e6f77dd0cb8ea652dab2e83d66e3e14de7af

From ea1a37e80b52795329c69b8054dc814ed270b8ef Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Sat, 12 Mar 2022 15:27:31 -0600
Subject: [PATCH 2/4] Bump Loop submodule

---
 Loop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Loop b/Loop
index 7f80ec15a7..f2ee9eab45 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit 7f80ec15a7287741c6a1fd0583f782c78b1cb42c
+Subproject commit f2ee9eab4598ee98169cb254eaebd09205b422b5

From 6547a632bb967953243a6eef842cf477893719ae Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Sat, 12 Mar 2022 15:35:29 -0600
Subject: [PATCH 3/4] Bump xcode version

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ee19321dc..35cb8a6f41 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 jobs:
   build:
     macos:
-      xcode: 13.0.0
+      xcode: 13.2.1
     steps:
       - checkout
       - run:

From 57fa6fd984133943ef545785fffe812fd17d5abb Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Sat, 12 Mar 2022 15:50:15 -0600
Subject: [PATCH 4/4] Bump NightscoutService

---
 NightscoutService | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NightscoutService b/NightscoutService
index a9f6e6f77d..7965ecd653 160000
--- a/NightscoutService
+++ b/NightscoutService
@@ -1 +1 @@
-Subproject commit a9f6e6f77dd0cb8ea652dab2e83d66e3e14de7af
+Subproject commit 7965ecd6536b342e7ff5d4361061c74143b81b5f