Merge pull request #8 from loopnlearn/alx-faps-rebase

FreeAPS v2.2 (202)
loopnlearn · Oct 3, 2021 · cff3672 · cff3672
2 parents ae80968 + a9af132
commit cff3672
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 26 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,26 +5,21 @@
 [submodule "LoopKit"]
 	path = LoopKit
 	url = https://github.com/LoopKit/LoopKit.git
-	branch = dev
 [submodule "CGMBLEKit"]
 	path = CGMBLEKit
 	url = https://github.com/LoopKit/CGMBLEKit.git
-	branch = dev
 [submodule "SwiftCharts"]
 	path = SwiftCharts
 	url = https://github.com/i-schuetz/SwiftCharts.git
 [submodule "dexcom-share-client-swift"]
 	path = dexcom-share-client-swift
 	url = https://github.com/LoopKit/dexcom-share-client-swift.git
-	branch = dev
 [submodule "G4ShareSpy"]
 	path = G4ShareSpy
 	url = https://github.com/LoopKit/G4ShareSpy.git
-	branch = dev
 [submodule "rileylink_ios"]
 	path = rileylink_ios
 	url = https://github.com/ps2/rileylink_ios.git
-	branch = carthage-pin
 [submodule "Amplitude-iOS"]
 	path = Amplitude-iOS
 	url = https://github.com/LoopKit/Amplitude-iOS.git
@@ -35,6 +30,7 @@
 [submodule "NightscoutAPIClient"]
 	path = NightscoutAPIClient
 	url = https://github.com/ivalkou/NightscoutAPIClient.git
-[submodule "bubble-client-swift"]
-	path = bubble-client-swift
-	url = https://github.com/bubbledevteam/bubble-client-swift
+[submodule "xdrip-client-swift"]
+	path = xdrip-client-swift
+	url = https://github.com/alekst1d/xdrip-client-swift
+        branch = master
diff --git a/CGMBLEKit b/CGMBLEKit
diff --git a/G4ShareSpy b/G4ShareSpy
diff --git a/Loop b/Loop
diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
@@ -356,6 +356,34 @@
                ReferencedContainer = "container:bubble-client-swift/BubbleClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "432B0E871CDFC3C50045347B"
+               BuildableName = "xDripClient.framework"
+               BlueprintName = "xDripClient"
+               ReferencedContainer = "container:xdrip-client-swift/xDripClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43A8EC81210E664300A81379"
+               BuildableName = "xDripClientUI.framework"
+               BlueprintName = "xDripClientUI"
+               ReferencedContainer = "container:xdrip-client-swift/xDripClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

diff --git a/LoopKit b/LoopKit
diff --git a/MKRingProgressView b/MKRingProgressView
diff --git a/bubble-client-swift b/bubble-client-swift
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
diff --git a/xdrip-client-swift b/xdrip-client-swift