Merge branch 'freeaps_dev' into freeaps

marionbarker · marionbarker · commit b076c460cd6e · 2023-01-16T17:36:59.000-08:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,33 +1,39 @@
+[submodule "Amplitude-iOS"]
+	path = Amplitude-iOS
+	url = https://github.com/loopnlearn/Amplitude-iOS.git
+[submodule "CGMBLEKit"]
+	path = CGMBLEKit
+	url = https://github.com/loopnlearn/CGMBLEKit.git
+[submodule "G4ShareSpy"]
+	path = G4ShareSpy
+	url = https://github.com/loopnlearn/G4ShareSpy.git
 [submodule "Loop"]
 	path = Loop
-	url=https://github.com/loopnlearn/Loop.git
+	url = https://github.com/loopnlearn/Loop.git
 [submodule "LoopKit"]
 	path = LoopKit
 	url = https://github.com/loopnlearn/LoopKit.git
-[submodule "CGMBLEKit"]
-	path = CGMBLEKit
-	url = https://github.com/loopnlearn/CGMBLEKit.git
+[submodule "MKRingProgressView"]
+	path = MKRingProgressView
+	url = https://github.com/loopnlearn/MKRingProgressView.git
+[submodule "NightscoutAPIClient"]
+	path = NightscoutAPIClient
+	url = https://github.com/ivalkou/NightscoutAPIClient.git
+[submodule "OmniBLE"]
+	path = OmniBLE
+	url = https://github.com/loopnlearn/OmniBLE.git
 [submodule "SwiftCharts"]
 	path = SwiftCharts
 	url = https://github.com/ps2/SwiftCharts.git
 [submodule "dexcom-share-client-swift"]
 	path = dexcom-share-client-swift
 	url = https://github.com/loopnlearn/dexcom-share-client-swift.git
-[submodule "G4ShareSpy"]
-	path = G4ShareSpy
-	url = https://github.com/loopnlearn/G4ShareSpy.git
+[submodule "libre-direct-client-swift"]
+	path = libre-direct-client-swift
+	url = https://github.com/loopnlearn/libre-direct-client-swift.git
 [submodule "rileylink_ios"]
 	path = rileylink_ios
 	url = https://github.com/loopnlearn/rileylink_ios.git
-[submodule "Amplitude-iOS"]
-	path = Amplitude-iOS
-	url = https://github.com/loopnlearn/Amplitude-iOS.git
-[submodule "MKRingProgressView"]
-	path = MKRingProgressView
-	url = https://github.com/loopnlearn/MKRingProgressView.git
-[submodule "NightscoutAPIClient"]
-	path = NightscoutAPIClient
-	url = https://github.com/ivalkou/NightscoutAPIClient.git
 [submodule "xdrip-client-swift"]
 	path = xdrip-client-swift
 	url = https://github.com/loopnlearn/xdrip-client-swift
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit fd96375bdd2c45bc803d69b1747cacaf22adde4b
+Subproject commit 4cfe04b2143d4d68a85fbbedbde84915a49bdba4
diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata
diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
@@ -300,6 +300,20 @@
                ReferencedContainer = "container:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "84752E8126ED0FFE009FD801"
+               BuildableName = "OmniBLE.framework"
+               BlueprintName = "OmniBLE"
+               ReferencedContainer = "container:OmniBLE/OmniBLE.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -384,6 +398,34 @@
                ReferencedContainer = "container:xdrip-client-swift/xDripClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "432B0E871CDFC3C50045347B"
+               BuildableName = "LibreDirectClient.framework"
+               BlueprintName = "LibreDirectClient"
+               ReferencedContainer = "container:libre-direct-client-swift/LibreDirectClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43A8EC81210E664300A81379"
+               BuildableName = "LibreDirectClientUI.framework"
+               BlueprintName = "LibreDirectClientUI"
+               ReferencedContainer = "container:libre-direct-client-swift/LibreDirectClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -393,7 +435,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-               BuildableName = "FreeAPS.app"
+               BuildableName = "Loop.app"
                BlueprintName = "Loop"
                ReferencedContainer = "container:Loop/Loop.xcodeproj">
             </BuildableReference>
@@ -423,7 +465,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-            BuildableName = "FreeAPS.app"
+            BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop/Loop.xcodeproj">
          </BuildableReference>
@@ -539,6 +581,16 @@
                ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "84752E8A26ED0FFE009FD801"
+               BuildableName = "OmniBLETests.xctest"
+               BlueprintName = "OmniBLETests"
+               ReferencedContainer = "container:OmniBLE/OmniBLE.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -556,7 +608,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-            BuildableName = "FreeAPS.app"
+            BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop/Loop.xcodeproj">
          </BuildableReference>
diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig
@@ -1,17 +1,14 @@
-//
+// This enables a persistent override file used across clones at the same level
+#include? "../../LoopConfigOverride.xcconfig"
 
 // Override this if you don't want the default com.${DEVELOPMENT_TEAM}.loopkit that loop uses
 // MAIN_APP_BUNDLE_IDENTIFIER = com.myname.loop
 
 // Customize this to change the app name displayed
-MAIN_APP_DISPLAY_NAME = FreeAPS
-
-MAIN_APP_PRODUCT_NAME = FreeAPS
+// MAIN_APP_DISPLAY_NAME = Loop
 
 // Features
-// SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) FEATURE_OVERRIDES_DISABLED
-
-// Assets
-INCLUDED_SOURCE_FILE_NAMES = AdditionalAssets.xcassets
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) ALLOW_SIMULATORS_ENABLED //ALLOW_DEBUG_FEATURES_ENABLED
 
-APPICON_NAME = CustomLoopIcon
+// Put your team id here for signing
+// LOOP_DEVELOPMENT_TEAM = YOUR_ID_HERE
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 3bfa9ede03cfd50aebdba25cf4afb3befb0adf8c
+Subproject commit 3707529d8ea388eda3c5e4ce454426fd5313a672
diff --git a/OmniBLE b/OmniBLE
@@ -0,0 +1 @@
+Subproject commit 01ae46b6c811ce29246799657a9a22a7e772fbf0
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit fbbd994708541c9dbaf31a1df34fa101ed93315e
+Subproject commit 4d44bf3b9d7a66f10e97ca61569b18688a661e46
diff --git a/libre-direct-client-swift b/libre-direct-client-swift
@@ -0,0 +1 @@
+Subproject commit bd2ac0e47f218de00ce4e3c41455fefa861f4177
diff --git a/rileylink_ios b/rileylink_ios
@@ -1 +1 @@
-Subproject commit 9f423ea82d8b6dd2e6c626ccc1150b8f4fc158a1
+Subproject commit 0a46c9d9b0dc1264d24c06539c26207c8b94337b
diff --git a/xdrip-client-swift b/xdrip-client-swift
@@ -1 +1 @@
-Subproject commit d97035c860dc72a149606c2e55c7d84dd74bc923
+Subproject commit bfe4fdfc9bf8a537c3f6b9c275030a526f637905
