From 63bdb9e4bb5bf86bb4161132b20f9fa7ff045c5e Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 5 Jul 2022 17:10:02 -0400 Subject: [PATCH] Upload fix --- Scripts/build_aggregate.sh | 4 ++-- Scripts/upload_core_ui_frameworks.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/build_aggregate.sh b/Scripts/build_aggregate.sh index 634a4e07..e72f1597 100755 --- a/Scripts/build_aggregate.sh +++ b/Scripts/build_aggregate.sh @@ -15,7 +15,7 @@ UNIVERSAL_OUTPUTFOLDER="${BUILD_DIR}/universal" # Update to use .xcframework sed -i '' 's|MVMCore.framework \*\/ = {isa.*};|MVMCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MVMCore.xcframework; path = ../SharedFrameworks/MVMCore.xcframework; sourceTree = ""; };|g' ./MVMCoreUI.xcodeproj/project.pbxproj sed -i '' 's/MVMCore.framework/MVMCore.xcframework/g' ./MVMCoreUI.xcodeproj/project.pbxproj -sed -i '' "s|path = \.\.\/SharedFrameworks|path = ${FRAMEWORKS_DIR}|g" ./MVMCoreUI.xcodeproj/project.pbxproj +#sed -i '' "s|path = \.\.\/SharedFrameworks|path = ${FRAMEWORKS_DIR}|g" ./MVMCoreUI.xcodeproj/project.pbxproj # Build device archive xcodebuild archive \ @@ -26,7 +26,7 @@ xcodebuild archive \ -destination 'generic/platform=iOS' \ SKIP_INSTALL=NO \ ONLY_ACTIVE_ARCH=NO \ - FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR \ + FRAMEWORK_SEARCH_PATHS="$FRAMEWORKS_DIR" \ ALWAYS_SEARCH_USER_PATHS=true # Build simulator archive diff --git a/Scripts/upload_core_ui_frameworks.sh b/Scripts/upload_core_ui_frameworks.sh index 5e70eb2f..70337d5f 100755 --- a/Scripts/upload_core_ui_frameworks.sh +++ b/Scripts/upload_core_ui_frameworks.sh @@ -7,7 +7,7 @@ # Copied from Hedden, Kyle Matthew on 3/2/18. # -BUILD_SETTINGS=$(xcodebuild -showBuildSettings -project ../MVMCoreUI/MVMCoreUI.xcodeproj) +BUILD_SETTINGS=$(xcodebuild -showBuildSettings -project ../MVMCoreUI.xcodeproj) FRAMEWORK_VERSION=$(echo "$BUILD_SETTINGS" | grep -w -o 'MARKETING_VERSION = .*' | cut -d\ -f3-) if [ $(git tag --list | grep "v${FRAMEWORK_VERSION}") ]; then echo This version tag has already been committed! Aborting!