diff --git a/.gitmodules b/.gitmodules index 87dca827b4..167da9d443 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "LibreTransmitter"] path = LibreTransmitter url = https://github.com/LoopKit/LibreTransmitter.git +[submodule "SugarMonitorService"] + path = SugarMonitorService + url = https://github.com/gestrich/SugarMonitorService.git diff --git a/Loop b/Loop index b6c5600bcb..e0ed3c3e5a 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit b6c5600bcbea6b2b3a2ec3695bc5e643ba4f5639 +Subproject commit e0ed3c3e5acd8b26ff1c16a60c6d7b04b020a286 diff --git a/LoopKit b/LoopKit index 069c88acf4..d7390b3452 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 069c88acf4ea2c6a1e63cea55ac3b2e3c439c8cc +Subproject commit d7390b3452deb192bfa60a644793a770f4626cb3 diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index b1d1574f06..7bcc35d405 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -96,4 +96,7 @@ + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index e4b458a30e..5afe2a6125 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "ff4ca06bf6a09d91b0401825dc466b55672f36331eab10789bcc55575e63476c", "pins" : [ { "identity" : "amplitude-ios", @@ -18,6 +19,15 @@ "version" : "1.0.1" } }, + { + "identity" : "appcenter-sdk-apple", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/appcenter-sdk-apple", + "state" : { + "revision" : "b2dc99cfedead0bad4e6573d86c5228c89cff332", + "version" : "4.4.3" + } + }, { "identity" : "base32", "kind" : "remoteSourceControl", @@ -71,6 +81,15 @@ "revision" : "8e4022f2852d77240d0a17482cbfe325354aac70" } }, + { + "identity" : "plcrashreporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/PLCrashReporter.git", + "state" : { + "revision" : "81cdec2b3827feb03286cb297f4c501a8eb98df1", + "version" : "1.10.2" + } + }, { "identity" : "slidebutton", "kind" : "remoteSourceControl", @@ -80,6 +99,15 @@ "revision" : "5eacebba4d7deeb693592bc9a62ab2d2181e133b" } }, + { + "identity" : "sugar_service", + "kind" : "remoteSourceControl", + "location" : "https://github.com/gestrich/sugar_service.git", + "state" : { + "branch" : "main", + "revision" : "06c3ca689c59178d27108e50c88f807730681def" + } + }, { "identity" : "swiftcharts", "kind" : "remoteSourceControl", @@ -108,5 +136,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index f229038ddf..0d33ee031b 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -216,6 +216,20 @@ ReferencedContainer = "container:TidepoolService/TidepoolService.xcodeproj"> + + + + "$EXPORT_OPTIONS_PATH" < + + + + compileBitcode + + teamID + ${TEAM_ID} + method + ${EXPORT_METHOD} + uploadSymbols + <${UPLOAD_SYMBOLS}/> + provisioningProfiles + + ${BUNDLE_ID} + ${PROVISIONING_PROFILE_NAME} + + + +EOF + xcodebuild -exportArchive \ + -archivePath $ARCHIVE_PATH \ + -exportPath $EXPORT_PATH \ + -exportOptionsPlist "$EXPORT_OPTIONS_PATH" \ + -allowProvisioningUpdates +} + +function appCenterUploads { + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + "../LoopRepoManagement/app-center-upload.sh" uploadIPA "${EXPORT_PATH}/${APP_NAME}.ipa" $APP_NAME "$DISTRIBUTION_GROUP" + "../LoopRepoManagement/app-center-upload.sh" uploadSymbols "${ARCHIVE_PATH}/dSYMs" $APP_NAME +} + +function runAll(){ + archive + exportAll + appCenterUploads +} + +# Check if the function exists + if [ $# -gt 0 ]; then +#if declare -f "$1" > /dev/null + # call arguments verbatim + "$@" +else + # Show a helpful error + echo "Functions Available:" + typeset -f | awk '!/^main[ (]/ && /^[^ {}]+ *\(\)/ { gsub(/[()]/, "", $1); print $1}' + exit 1 +fi +