From a5db243e7ccdea1cb02f814dffac18f25155a643 Mon Sep 17 00:00:00 2001 From: Fernando Moya de Rivas Date: Mon, 2 Nov 2020 17:46:47 +0000 Subject: [PATCH] Fixing flows after extraction --- .github/workflows/rebase-legacy-branch.yml | 4 +++- SwiftUIPager.xcodeproj/project.pbxproj | 2 +- SwiftUIPager/{ => SupportFiles}/Info-macOS.plist | 0 scripts/build_xcframework.sh | 11 +++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) rename SwiftUIPager/{ => SupportFiles}/Info-macOS.plist (100%) diff --git a/.github/workflows/rebase-legacy-branch.yml b/.github/workflows/rebase-legacy-branch.yml index a29dbad..f3b412e 100644 --- a/.github/workflows/rebase-legacy-branch.yml +++ b/.github/workflows/rebase-legacy-branch.yml @@ -12,7 +12,9 @@ jobs: rebase: name: Checkout legacy-projects and rebase runs-on: ubuntu-latest - steps: + steps: + - uses: actions/checkout@v2 + - name: Automatic Rebase env: GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} diff --git a/SwiftUIPager.xcodeproj/project.pbxproj b/SwiftUIPager.xcodeproj/project.pbxproj index e135f61..cb0200f 100644 --- a/SwiftUIPager.xcodeproj/project.pbxproj +++ b/SwiftUIPager.xcodeproj/project.pbxproj @@ -128,7 +128,7 @@ /* Begin PBXFileReference section */ 172F4D6023DF830600FD2F15 /* SwiftUIPager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 172F4D6123DF830600FD2F15 /* Info-macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-macOS.plist"; path = "/Users/fernando.moyaderivas/Documents/Playgrounds/SwiftUIPager/SwiftUIPager/Info-macOS.plist"; sourceTree = ""; }; + 172F4D6123DF830600FD2F15 /* Info-macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = ""; }; 172F4D7823DF8A6400FD2F15 /* SwiftUIPager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftUIPager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 172F4D7B23DF8A6400FD2F15 /* Info-watchOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-watchOS.plist"; sourceTree = ""; }; 6B0F33DD24B4A4DE006031BE /* OnDeactivateModifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnDeactivateModifier.swift; sourceTree = ""; }; diff --git a/SwiftUIPager/Info-macOS.plist b/SwiftUIPager/SupportFiles/Info-macOS.plist similarity index 100% rename from SwiftUIPager/Info-macOS.plist rename to SwiftUIPager/SupportFiles/Info-macOS.plist diff --git a/scripts/build_xcframework.sh b/scripts/build_xcframework.sh index a781d05..58a21c8 100755 --- a/scripts/build_xcframework.sh +++ b/scripts/build_xcframework.sh @@ -4,8 +4,10 @@ LIB_NAME="SwiftUIPager" PROJ_PATH="$LIB_NAME.xcodeproj" BUILD_PATH=".build" FRAMEWORKS_PATH="$BUILD_PATH/frameworks" -XCFRAMEWORK_PATH="$BUILD_PATH/$LIB_NAME.xcframework" -XCFRAMEWORK_ZIP_PATH="$XCFRAMEWORK_PATH.zip" +XCFRAMEWORK_NAME="$LIB_NAME.xcframework" +XCFRAMEWORK_ZIP="$XCFRAMEWORK_NAME.zip" +XCFRAMEWORK_PATH="$BUILD_PATH/$XCFRAMEWORK_NAME" +XCFRAMEWORK_ZIP_PATH="$BUILD_PATH/$XCFRAMEWORK_ZIP" rm $XCFRAMEWORK_ZIP_PATH SCHEMES=( SwiftUIPager_Catalyst SwiftUIPager_macOS SwiftUIPager_iOS SwiftUIPager_watchOS SwiftUIPager_tvOS ) @@ -46,6 +48,7 @@ done COMMAND="$COMMAND -output $XCFRAMEWORK_PATH" $COMMAND | xcpretty rm -rd $FRAMEWORKS_PATH -zip -r $XCFRAMEWORK_ZIP_PATH $XCFRAMEWORK_PATH -rm -rd $XCFRAMEWORK_PATH +cd $BUILD_PATH +zip -r -X $XCFRAMEWORK_ZIP $XCFRAMEWORK_NAME +rm -rd $XCFRAMEWORK_NAME echo ::set-output name=path::$XCFRAMEWORK_ZIP_PATH \ No newline at end of file