Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev

# Conflicts:
#	Cartfile.resolved

Author: ivalkou

Cartfile.resolved

@@ -1,8 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "7417605dd898bf89378171941126c85d85dc642c"
+github "LoopKit/CGMBLEKit" "8983147b950a21f736c3e51c1e5ac5c82a6e22d0"
 github "LoopKit/G4ShareSpy" "e62d296067180c6659166272ff9cc406f470ec9e"
-github "LoopKit/LoopKit" "16276559436956e2f7cb343b73b767779f9f477f"
+github "LoopKit/LoopKit" "c49025f74aa22845eec58546d4b00f189632246b"
 github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
 github "LoopKit/dexcom-share-client-swift" "c4f3d48e56e5b3ad786486ccd1bbc753034096d2"
 github "i-schuetz/SwiftCharts" "0.6.5"
-github "ps2/rileylink_ios" "92314a08f26e94e271961a629e4d7b898e4e2e4d"
+github "ps2/rileylink_ios" "3082367b3484586cd3a70a7134edef3ea35c6b9b"

Loop.xcodeproj/project.pbxproj

@@ -2395,7 +2395,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/copy-frameworks.sh\n\n";
+			shellScript = "\"${SRCROOT}/Scripts/copy-frameworks.sh\"\n\n";
 		};
 		43EDDBEF1C361BCE007D89B5 /* Copy Frameworks with Carthage */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2439,7 +2439,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/copy-frameworks.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/copy-frameworks.sh\"\n";
 		};
 		43FF3DF620A8EFE800F8E62C /* Copy Frameworks with Carthage */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2459,7 +2459,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/copy-frameworks.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/copy-frameworks.sh\"\n";
 		};
 		A942E448225FD9D500DD4980 /* Copy Frameworks with Carthage */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2479,7 +2479,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/copy-frameworks.sh\n\n";
+			shellScript = "\"${SRCROOT}/Scripts/copy-frameworks.sh\"\n\n";
 		};
 		C16DA84322E8E5FF008624C2 /* Install Plugins */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2497,7 +2497,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/copy-plugins.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/copy-plugins.sh\"\n";
 		};
 		C1D1405722FB66DF00DA6242 /* Build Derived Assets */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2515,7 +2515,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/build-derived-assets.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/build-derived-assets.sh\"\n";
 		};
 		C1D1406222FB7ED200DA6242 /* Build Derived Watch Assets */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2533,7 +2533,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/build-derived-watch-assets.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/build-derived-watch-assets.sh\"\n";
 		};
 		C1D19800232CFA2A0096D646 /* Capture Build Details */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2551,7 +2551,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/Scripts/capture-build-details.sh\n";
+			shellScript = "\"${SRCROOT}/Scripts/capture-build-details.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Scripts/capture-build-details.sh

@@ -6,7 +6,7 @@
 #  Copyright © 2019 LoopKit Authors. All rights reserved.
 
 echo "Gathering build details in ${SRCROOT}"
-cd ${SRCROOT}
+cd "${SRCROOT}"
 
 plist="${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}"
 
@@ -16,7 +16,7 @@ if [ -e .git ]; then
   branch=$(git branch | grep \* | cut -d ' ' -f2-)
   plutil -replace com-loopkit-Loop-git-branch -string "${branch}" "${plist}"
 fi;
-plutil -replace com-loopkit-Loop-srcroot -string ${SRCROOT} "${plist}"
+plutil -replace com-loopkit-Loop-srcroot -string "${SRCROOT}" "${plist}"
 plutil -replace com-loopkit-Loop-build-date -string "$(date)" "${plist}"
 plutil -replace com-loopkit-Loop-xcode-version -string "${XCODE_PRODUCT_BUILD_VERSION}" "${plist}"