From 17018ea20fec25861c45569ede2e1fe724892cf7 Mon Sep 17 00:00:00 2001 From: Magesh K <47920326+mahee96@users.noreply.github.com> Date: Fri, 13 Dec 2024 01:49:06 +0530 Subject: [PATCH] [CI]: setup CI for rebase-2.0-wip branch --- .../workflows/increase-rebase-build-num.sh | 28 ++++ .github/workflows/rebase.yml | 150 ++++++++++++++++++ AltStore.xcodeproj/project.pbxproj | 138 +++++++++------- .../xcshareddata/swiftpm/Package.resolved | 47 +++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/swiftpm/Package.resolved | 2 +- Makefile | 2 +- Podfile.lock | 14 +- 8 files changed, 311 insertions(+), 78 deletions(-) create mode 100644 .github/workflows/increase-rebase-build-num.sh create mode 100644 .github/workflows/rebase.yml delete mode 100644 AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.github/workflows/increase-rebase-build-num.sh b/.github/workflows/increase-rebase-build-num.sh new file mode 100644 index 00000000..9d1f686a --- /dev/null +++ b/.github/workflows/increase-rebase-build-num.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Ensure we are in root directory +cd "$(dirname "$0")/../.." + +DATE=`date -u +'%Y.%m.%d'` +BUILD_NUM=1 + +write() { + sed -e "/MARKETING_VERSION = .*/s/$/-rebase.$DATE.$BUILD_NUM+$(git rev-parse --short HEAD)/" -i '' Build.xcconfig + echo "$DATE,$BUILD_NUM" > .rebase-build-num +} + +if [ ! -f ".rebase-build-num" ]; then + write + exit 0 +fi + +LAST_DATE=`cat .rebase-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $1'` +LAST_BUILD_NUM=`cat .rebase-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $2'` + +if [[ "$DATE" != "$LAST_DATE" ]]; then + write +else + BUILD_NUM=`expr $LAST_BUILD_NUM + 1` + write +fi + diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 00000000..ba3b5473 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,150 @@ +name: Altstore 2.0 rebase build +on: + push: + branches: + - rebase-2.0-wip + +jobs: + build: + name: Build and upload SideStore 0.5.6-rebase + concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + strategy: + fail-fast: false + matrix: + include: + - os: 'macos-14' + version: '15.4' + + runs-on: ${{ matrix.os }} + steps: + + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Install dependencies + run: brew install ldid + + - name: Cache .rebase-build-num + uses: actions/cache@v4 + with: + path: .rebase-build-num + key: rebase-build-num + + - name: Increase rebase build number and set as version + run: bash .github/workflows/increase-rebase-build-num.sh + + - name: Get version + id: version + run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT + + - name: Echo version + run: echo "${{ steps.version.outputs.version }}" + + - name: Setup Xcode + uses: maxim-lobanov/setup-xcode@v1.6.0 + with: + xcode-version: ${{ matrix.version }} + + - name: Cache Build + uses: irgaly/xcode-cache@v1 + with: + key: xcode-cache-deriveddata-${{ github.sha }} + restore-keys: xcode-cache-deriveddata- + + - name: Restore Pods from Cache (Exact match) + id: pods-restore + uses: actions/cache/restore@v3 + with: + path: | + ./Podfile.lock + ./Pods/ + ./AltStore.xcworkspace/ + key: pods-cache-${{ hashFiles('Podfile') }} + # restore-keys: | # commented out to strictly check cache for this particular podfile + # pods-cache- + + - name: Restore Pods from Cache (Last Available) + if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} + id: pods-restore-recent + uses: actions/cache/restore@v3 + with: + path: | + ./Podfile.lock + ./Pods/ + ./AltStore.xcworkspace/ + key: pods-cache- + + - name: Install CocoaPods + if: ${{ steps.pods-restore.outputs.cache-hit != 'true'}} + id: pods-install + run: | + pod install + + - name: Save Pods to Cache + id: save-pods + if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v3 + with: + path: | + ./Podfile.lock + ./Pods/ + ./AltStore.xcworkspace/ + key: pods-cache-${{ hashFiles('Podfile') }} + + - name: List Files and derived data + run: | + echo ">>>>>>>>> Workdir <<<<<<<<<<" + ls -la . + echo "" + + echo ">>>>>>>>> Pods <<<<<<<<<<" + find Pods -maxdepth 2 -exec ls -ld {} + || true # List contents if directory exists + echo "" + + echo ">>>>>>>>> SideStore <<<<<<<<<<" + find SideStore -maxdepth 2 -exec ls -ld {} + || true # List contents if directory exists + echo "" + + echo ">>>>>>>>> Dependencies <<<<<<<<<<" + find Dependencies -maxdepth 2 -exec ls -ld {} + || true # List contents if directory exists + echo "" + + echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<" + ls -la ~/Library/Developer/Xcode/DerivedData || true # List contents if directory exists + echo "" + + - name: Build SideStore + run: make build | xcpretty && exit ${PIPESTATUS[0]} + + - name: Fakesign app + run: make fakesign + + - name: Convert to IPA + run: make ipa + + - name: Get current date + id: date + run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT + + - name: Get current date in AltStore date form + id: date_altstore + run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT + + - name: Add version to IPA file name + run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa + + - name: Upload SideStore.ipa Artifact + uses: actions/upload-artifact@v4 + with: + name: SideStore-${{ steps.version.outputs.version }}.ipa + path: SideStore-${{ steps.version.outputs.version }}.ipa + + - name: Upload *.dSYM Artifact + uses: actions/upload-artifact@v4 + with: + name: SideStore-${{ steps.version.outputs.version }}-dSYM + path: ./*.dSYM/ diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 2b1b209b..c9eee9bd 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 03F06CD52942C27E001C4D68 /* Bundle+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1E314122A05D4C00370A3C /* Bundle+AltStore.swift */; }; - 043F66F7ED2A7F6D1C7D5AFC /* Pods_AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 555322EC002A17742BB05CB5 /* Pods_AltStoreCore.framework */; }; 0E05025C2BEC947000879B5C /* String+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E05025B2BEC947000879B5C /* String+SideStore.swift */; }; 0E13E5862CC8F55900E9C0DF /* ProcessInfo+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E13E5852CC8F55900E9C0DF /* ProcessInfo+SideStore.swift */; }; 0E1A1F912AE36A9700364CAD /* bytearray.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E1A1F902AE36A9600364CAD /* bytearray.c */; }; @@ -49,6 +48,7 @@ 0EE7FDCD2BE9124400D1E390 /* ErrorDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */; }; 19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */; }; 19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; }; + 551A15E55999499418AC1022 /* Pods_AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 707E746318F0B6F1A44935D3 /* Pods_AltStoreCore.framework */; }; A800F7042CE28E3800208744 /* View+AltWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = A800F7032CE28E2F00208744 /* View+AltWidget.swift */; }; A809F69E2D04D7AC00F0F0F3 /* libminimuxer_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A809F68E2D04D71200F0F0F3 /* libminimuxer_static.a */; }; A809F69F2D04D7B300F0F0F3 /* libem_proxy_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A809F6942D04D71200F0F0F3 /* libem_proxy_static.a */; }; @@ -273,7 +273,6 @@ BFC84A4D2421A19100853474 /* SourcesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFC84A4C2421A19100853474 /* SourcesViewController.swift */; }; BFCB9207250AB2120057B44E /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BFCB9206250AB2120057B44E /* Colors.xcassets */; }; BFCCB51A245E3401001853EA /* VerifyAppOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCCB519245E3401001853EA /* VerifyAppOperation.swift */; }; - BFCF8E4A4067433E51FB0427 /* Pods_SideStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D341B8E7825862E2941592C0 /* Pods_SideStore.framework */; }; BFD2476E2284B9A500981D42 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD2476D2284B9A500981D42 /* AppDelegate.swift */; }; BFD247752284B9A500981D42 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BFD247732284B9A500981D42 /* Main.storyboard */; }; BFD247772284B9A700981D42 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BFD247762284B9A700981D42 /* Assets.xcassets */; }; @@ -311,6 +310,7 @@ BFF0B69A2322D7D0007A79E1 /* UIScreen+CompactHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF0B6992322D7D0007A79E1 /* UIScreen+CompactHeight.swift */; }; BFF435D8255CBDAB00DD724F /* ALTApplication+AltStoreApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF435D7255CBDAB00DD724F /* ALTApplication+AltStoreApp.swift */; }; BFF615A82510042B00484D3B /* AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF66EE7E2501AE50007EE018 /* AltStoreCore.framework */; }; + D1943BFD9E94656DAC803C45 /* Pods_SideStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCE2A19A7C2907575E49B81 /* Pods_SideStore.framework */; }; D50107EC2ADF2E1A0069F2A1 /* AddSourceTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D50107EB2ADF2E1A0069F2A1 /* AddSourceTextFieldCell.swift */; }; D5084CCC2B1EA80100C02160 /* FeaturedComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5084CCB2B1EA80100C02160 /* FeaturedComponents.swift */; }; D513F6162A12CE4E0061EAA1 /* SourceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D571ADCD2A02FA7400B24B63 /* SourceError.swift */; }; @@ -571,10 +571,11 @@ 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = ""; }; 191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; }; 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = ""; }; - 2B1E0A6A6742A1CFFF497C58 /* Pods-SideStore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SideStore.release.xcconfig"; path = "Target Support Files/Pods-SideStore/Pods-SideStore.release.xcconfig"; sourceTree = ""; }; - 46D9208C3825950D4F1A2D03 /* Pods-AltStoreCore.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AltStoreCore.debug.xcconfig"; path = "Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.debug.xcconfig"; sourceTree = ""; }; - 555322EC002A17742BB05CB5 /* Pods_AltStoreCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AltStoreCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 95B88A121F6E959483F88410 /* Pods-SideStore.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SideStore.debug.xcconfig"; path = "Target Support Files/Pods-SideStore/Pods-SideStore.debug.xcconfig"; sourceTree = ""; }; + 32741831F952989EC7E74FFA /* Pods-SideStore.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SideStore.debug.xcconfig"; path = "Target Support Files/Pods-SideStore/Pods-SideStore.debug.xcconfig"; sourceTree = ""; }; + 37C39DA99ADEE21E3BDD056F /* Pods-AltStoreCore.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AltStoreCore.debug.xcconfig"; path = "Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.debug.xcconfig"; sourceTree = ""; }; + 5DCE2A19A7C2907575E49B81 /* Pods_SideStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SideStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 707E746318F0B6F1A44935D3 /* Pods_AltStoreCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AltStoreCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7935E4499B2FC11DA8BAB2CC /* Pods-AltStoreCore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AltStoreCore.release.xcconfig"; path = "Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.release.xcconfig"; sourceTree = ""; }; A800F7032CE28E2F00208744 /* View+AltWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+AltWidget.swift"; sourceTree = ""; }; A809F6A22D04DA1900F0F0F3 /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = minimuxer.h; sourceTree = ""; }; A809F6A32D04DA1900F0F0F3 /* minimuxer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = minimuxer.swift; sourceTree = ""; }; @@ -858,8 +859,7 @@ BFF767CB2489AB5C0097E58C /* ALTServerError+Conveniences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ALTServerError+Conveniences.swift"; sourceTree = ""; }; BFF767CD2489ABE90097E58C /* NetworkConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkConnection.swift; sourceTree = ""; }; BFF7EC4C25081E9300BDE521 /* AltStore 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "AltStore 8.xcdatamodel"; sourceTree = ""; }; - C19141888CA51B1BFE9EE427 /* Pods-AltStoreCore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AltStoreCore.release.xcconfig"; path = "Target Support Files/Pods-AltStoreCore/Pods-AltStoreCore.release.xcconfig"; sourceTree = ""; }; - D341B8E7825862E2941592C0 /* Pods_SideStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SideStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C0ED2BA78F87A9001A13E715 /* Pods-SideStore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SideStore.release.xcconfig"; path = "Target Support Files/Pods-SideStore/Pods-SideStore.release.xcconfig"; sourceTree = ""; }; D50107EB2ADF2E1A0069F2A1 /* AddSourceTextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSourceTextFieldCell.swift; sourceTree = ""; }; D5084CCB2B1EA80100C02160 /* FeaturedComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturedComponents.swift; sourceTree = ""; }; D5144BA72B8684EF00738A5C /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = ""; }; @@ -1008,8 +1008,8 @@ files = ( A8945AA62D059B6100D86CBE /* Roxas.framework in Frameworks */, A82067C42D03E0DE00645C0D /* SemanticVersion in Frameworks */, - 043F66F7ED2A7F6D1C7D5AFC /* Pods_AltStoreCore.framework in Frameworks */, A81177012D0B3C6C00D6C122 /* AltSign-Static in Frameworks */, + 551A15E55999499418AC1022 /* Pods_AltStoreCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1036,7 +1036,7 @@ D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */, BF1614F1250822F100767AEA /* Roxas.framework in Frameworks */, BF66EE852501AE50007EE018 /* AltStoreCore.framework in Frameworks */, - BFCF8E4A4067433E51FB0427 /* Pods_SideStore.framework in Frameworks */, + D1943BFD9E94656DAC803C45 /* Pods_SideStore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1741,8 +1741,8 @@ BF4588872298DD3F00BD7491 /* libxml2.tbd */, BF088D322501A4FF008082D9 /* OpenSSL.xcframework */, BFD247862284BB3B00981D42 /* Roxas.framework */, - 555322EC002A17742BB05CB5 /* Pods_AltStoreCore.framework */, - D341B8E7825862E2941592C0 /* Pods_SideStore.framework */, + 707E746318F0B6F1A44935D3 /* Pods_AltStoreCore.framework */, + 5DCE2A19A7C2907575E49B81 /* Pods_SideStore.framework */, ); name = Frameworks; sourceTree = ""; @@ -1935,10 +1935,10 @@ C2B79346E83FCBDE76D501CB /* Pods */ = { isa = PBXGroup; children = ( - 46D9208C3825950D4F1A2D03 /* Pods-AltStoreCore.debug.xcconfig */, - C19141888CA51B1BFE9EE427 /* Pods-AltStoreCore.release.xcconfig */, - 95B88A121F6E959483F88410 /* Pods-SideStore.debug.xcconfig */, - 2B1E0A6A6742A1CFFF497C58 /* Pods-SideStore.release.xcconfig */, + 37C39DA99ADEE21E3BDD056F /* Pods-AltStoreCore.debug.xcconfig */, + 7935E4499B2FC11DA8BAB2CC /* Pods-AltStoreCore.release.xcconfig */, + 32741831F952989EC7E74FFA /* Pods-SideStore.debug.xcconfig */, + C0ED2BA78F87A9001A13E715 /* Pods-SideStore.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -2209,7 +2209,7 @@ isa = PBXNativeTarget; buildConfigurationList = BF66EE892501AE50007EE018 /* Build configuration list for PBXNativeTarget "AltStoreCore" */; buildPhases = ( - 0CB1FF5E798E7639208EA36F /* [CP] Check Pods Manifest.lock */, + AEDB4E9409D2CEE1EA126980 /* [CP] Check Pods Manifest.lock */, BF66EE792501AE50007EE018 /* Headers */, BF66EE7A2501AE50007EE018 /* Sources */, BF66EE7B2501AE50007EE018 /* Frameworks */, @@ -2250,14 +2250,15 @@ isa = PBXNativeTarget; buildConfigurationList = BFD2477E2284B9A700981D42 /* Build configuration list for PBXNativeTarget "SideStore" */; buildPhases = ( - 395F0816F85B2B393F66FB2E /* [CP] Check Pods Manifest.lock */, + B0FAA6617CB97872E78D84CA /* [CP] Check Pods Manifest.lock */, 99F87D0629D8B51400B40039 /* ShellScript */, BFD247662284B9A500981D42 /* Sources */, BFD247672284B9A500981D42 /* Frameworks */, BFD247682284B9A500981D42 /* Resources */, BF088D2B2501A087008082D9 /* Embed Frameworks */, BF98917B250AABF4002ACF50 /* Embed Foundation Extensions */, - 3CE7B9D4B56258F37C584783 /* [CP] Embed Pods Frameworks */, + A5CC24EB35C79F0C13DAE403 /* [CP] Embed Pods Frameworks */, + 884B4E831D26F2E18AF7916C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2469,7 +2470,59 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0CB1FF5E798E7639208EA36F /* [CP] Check Pods Manifest.lock */ = { + 884B4E831D26F2E18AF7916C /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 99F87D0629D8B51400B40039 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + "./SideStore/minimuxer/minimuxer-helpers.swift", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "bash ./SideStore/fetch-prebuilt.sh minimuxer\n"; + }; + A5CC24EB35C79F0C13DAE403 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + AEDB4E9409D2CEE1EA126980 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2491,7 +2544,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 395F0816F85B2B393F66FB2E /* [CP] Check Pods Manifest.lock */ = { + B0FAA6617CB97872E78D84CA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2513,41 +2566,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3CE7B9D4B56258F37C584783 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SideStore/Pods-SideStore-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 99F87D0629D8B51400B40039 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - "./SideStore/minimuxer/minimuxer-helpers.swift", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "bash ./SideStore/fetch-prebuilt.sh minimuxer\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -3193,7 +3211,7 @@ }; BF66EE872501AE50007EE018 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 46D9208C3825950D4F1A2D03 /* Pods-AltStoreCore.debug.xcconfig */; + baseConfigurationReference = 37C39DA99ADEE21E3BDD056F /* Pods-AltStoreCore.debug.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -3231,7 +3249,7 @@ }; BF66EE882501AE50007EE018 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C19141888CA51B1BFE9EE427 /* Pods-AltStoreCore.release.xcconfig */; + baseConfigurationReference = 7935E4499B2FC11DA8BAB2CC /* Pods-AltStoreCore.release.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -3475,7 +3493,7 @@ }; BFD2477F2284B9A700981D42 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 95B88A121F6E959483F88410 /* Pods-SideStore.debug.xcconfig */; + baseConfigurationReference = 32741831F952989EC7E74FFA /* Pods-SideStore.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -3518,7 +3536,7 @@ }; BFD247802284B9A700981D42 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2B1E0A6A6742A1CFFF497C58 /* Pods-SideStore.release.xcconfig */; + baseConfigurationReference = C0ED2BA78F87A9001A13E715 /* Pods-SideStore.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8205d75e..79c78fd0 100644 --- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,33 @@ { - "originHash" : "e97900bbb49eb7423d5c5ecbf132d2d5761c401e2444f3c8e6cbfa7014ad9c53", + "originHash" : "651c08f9bde24d0e177b7785a44f17381beebf0b9ce92a0daa33f260f8bfae84", "pins" : [ + { + "identity" : "altsign", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SideStore/AltSign", + "state" : { + "branch" : "master", + "revision" : "74c9572a3be4c3faeccc835334b7b9af0a7a8d16" + } + }, + { + "identity" : "appcenter-sdk-apple", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/appcenter-sdk-apple", + "state" : { + "revision" : "ab54f758243f282d290b33027e8aac910d3d859a", + "version" : "5.0.5" + } + }, + { + "identity" : "imobiledevice.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SideStore/iMobileDevice.swift", + "state" : { + "revision" : "74e481106dd155c0cd21bca6795fd9fe5f751654", + "version" : "1.0.5" + } + }, { "identity" : "launchatlogin", "kind" : "remoteSourceControl", @@ -10,6 +37,24 @@ "version" : "4.2.0" } }, + { + "identity" : "openssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/OpenSSL", + "state" : { + "revision" : "8cb1d641ab5ebce2cd7cf31c93baef07bed672d4", + "version" : "1.1.2301" + } + }, + { + "identity" : "plcrashreporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/PLCrashReporter.git", + "state" : { + "revision" : "6752f71de206f6a53fa6a758c3660fd9a7fe7527", + "version" : "1.11.2" + } + }, { "identity" : "semanticversion", "kind" : "remoteSourceControl", diff --git a/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved index 564ff9f1..b2cb77b2 100644 --- a/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "4dbb9bc7b9b584bd8caaddd8528339d100a415de376ed7595bf934e0b32d22fc", + "originHash" : "651c08f9bde24d0e177b7785a44f17381beebf0b9ce92a0daa33f260f8bfae84", "pins" : [ { "identity" : "altsign", diff --git a/Makefile b/Makefile index 3caace77..5f4d5e95 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ test: ## -- Building -- build: - @xcodebuild -project AltStore.xcodeproj \ + @xcodebuild -workspace AltStore.xcworkspace \ -scheme SideStore \ -sdk iphoneos \ archive -archivePath ./archive \ diff --git a/Podfile.lock b/Podfile.lock index 477ad177..5952ec90 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - AppCenter (5.0.1): - - AppCenter/Analytics (= 5.0.1) - - AppCenter/Crashes (= 5.0.1) - - AppCenter/Analytics (5.0.1): + - AppCenter (5.0.5): + - AppCenter/Analytics (= 5.0.5) + - AppCenter/Crashes (= 5.0.5) + - AppCenter/Analytics (5.0.5): - AppCenter/Core - - AppCenter/Core (5.0.1) - - AppCenter/Crashes (5.0.1): + - AppCenter/Core (5.0.5) + - AppCenter/Crashes (5.0.5): - AppCenter/Core - KeychainAccess (4.2.2) - Nuke (10.7.1) @@ -25,7 +25,7 @@ SPEC REPOS: - Starscream SPEC CHECKSUMS: - AppCenter: 18153bb6bc4241d14c8cce57466ac1c88136b476 + AppCenter: 994875ea7941b9e168babb98299f900a94bcef13 KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51 Nuke: 279f17a599fd1c83cf51de5e0e1f2db143a287b0 Starscream: 19b5533ddb925208db698f0ac508a100b884a1b9