diff --git a/.github/RELEASE_TEMPLATE/Release.md b/.github/RELEASE_TEMPLATE/Release.md index 6af941e..1c68b21 100644 --- a/.github/RELEASE_TEMPLATE/Release.md +++ b/.github/RELEASE_TEMPLATE/Release.md @@ -16,3 +16,6 @@ Current App Compatibility: `iOS/iPadOS 15.0` or later ### Issues in this Release: - LowContrastMode does not work *(Compatible only with YouTube v17.33.2-v17.38.10)* - Hiding Shorts creates an empty space instead #55 + +### Catbox +`%catbox_url%` \ No newline at end of file diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index 0124f5b..aa6cdda 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -119,14 +119,13 @@ jobs: run: | unzip -q main/YouTube.ipa -d main/tmp echo "YT_VERSION=$(grep -A 1 'CFBundleVersion' main/tmp/Payload/YouTube.app/Info.plist | grep '' | awk -F'[><]' '{print $3}')" >> $GITHUB_ENV + wget -qO- https://github.com/dayanch96/YTLite/releases/latest > main/tmp/release_page.html + YTLITE_VERSION=$(grep -o -E '/tag/v[^"]+' main/tmp/release_page.html | head -n 1 | sed 's/\/tag\/v//') + echo "YTLITE_VERSION=${YTLITE_VERSION}" >> $GITHUB_ENV + echo $YTLITE_VERSION rm -rf main/tmp/Payload/YouTube.app/_CodeSignature/CodeResources rm -rf main/tmp/Payload/YouTube.app/PlugIns/* cp -R main/Extensions/*.appex main/tmp/Payload/YouTube.app/PlugIns - echo "YTLITE_VERSION=$(grep ^PACKAGE_VERSION ${{ github.workspace }}/main/Tweaks/YTLite/Makefile | awk '{print $3}')" >> $GITHUB_ENV - - LATEST_RELEASE=$(curl -s "https://api.github.com/repos/dayanch96/YTLite/releases/latest" | jq -r ".tag_name") - YTLITE_VERSION=$(echo "$LATEST_RELEASE" | sed 's/v//') - echo "YTLITE_VERSION=$YTLITE_VERSION" >> $GITHUB_ENV env: THEOS: ${{ github.workspace }}/theos @@ -148,7 +147,6 @@ jobs: THEOS: ${{ github.workspace }}/theos BUNDLE_ID: ${{ inputs.bundle_id }} APP_NAME: ${{ inputs.app_name }} - TARGET: "iphone:latest:14.0" - name: Upload Artifact uses: actions/upload-artifact@v4.3.3 @@ -156,11 +154,19 @@ jobs: name: YTLitePlus_${{ env.YT_VERSION }}_${{ env.YTLITE_VERSION }} path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }} if-no-files-found: error + + - name: Upload Artifact to Catbox + run: | + RESPONSE=$(curl -F "reqtype=fileupload" -F "fileToUpload=@${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }}" https://catbox.moe/user/api.php) + CATBOX_URL=$(echo $RESPONSE | grep -o -E 'https://files.catbox.moe/[^"]*') + echo "Uploaded artifact to $CATBOX_URL" + CATBOX_FILE=$(echo $CATBOX_URL | sed 's|https://files.catbox.moe/||') + echo "CATBOX_FILE=$CATBOX_FILE" >> $GITHUB_ENV - name: Prepare Release Notes run: | export TODAY=$(date '+%Y-%m-%d') - sed "s/%ytliteplus_version%/${{ env.YTLITE_VERSION }}/g; s/%youtube_version%/${{ env.YT_VERSION }}/g; s/%date%/$TODAY/g" \ + sed "s/%ytliteplus_version%/${{ env.YTLITE_VERSION }}/g; s/%youtube_version%/${{ env.YT_VERSION }}/g; s/%catbox_url%/${{ env.CATBOX_FILE }}/g; s/%date%/$TODAY/g" \ main/.github/RELEASE_TEMPLATE/Release.md > ${{ github.workspace }}/release_notes.md - name: Create Release diff --git a/Makefile b/Makefile index df5f81f..998cb5f 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ MODULES = jailed FINALPACKAGE = 1 CODESIGN_IPA = 0 PACKAGE_VERSION = X.X.X-X.X -YTLITE_VERSION = 4.0 TWEAK_NAME = YTLitePlus DISPLAY_NAME = YouTube @@ -25,10 +24,10 @@ SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tw include $(THEOS_MAKE_PATH)/aggregate.mk YTLITE_PATH = Tweaks/YTLite +YTLITE_VERSION := $(shell wget -qO- "https://github.com/dayanch96/YTLite/releases/latest" | grep -o -E '/tag/v[^"]+' | head -n 1 | sed 's/\/tag\/v//') YTLITE_DEB = $(YTLITE_PATH)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb YTLITE_DYLIB = $(YTLITE_PATH)/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib YTLITE_BUNDLE = $(YTLITE_PATH)/var/jb/Library/Application\ Support/YTLite.bundle - before-package:: @echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m" @mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \; @@ -55,6 +54,7 @@ before-all:: @if [[ ! -f $(YTLITE_DEB) ]]; then \ rm -rf $(YTLITE_PATH)/*; \ $(PRINT_FORMAT_BLUE) "Downloading YTLite"; \ + echo "YTLITE_VERSION: $(YTLITE_VERSION)"; \ curl -s -L "https://github.com/dayanch96/YTLite/releases/download/v$(YTLITE_VERSION)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb" -o $(YTLITE_DEB); \ tar -xf $(YTLITE_DEB) -C $(YTLITE_PATH); tar -xf $(YTLITE_PATH)/data.tar* -C $(YTLITE_PATH); \ if [[ ! -f $(YTLITE_DYLIB) || ! -d $(YTLITE_BUNDLE) ]]; then \ diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD index 9bf17bf..ec0c012 160000 --- a/Tweaks/YTUHD +++ b/Tweaks/YTUHD @@ -1 +1 @@ -Subproject commit 9bf17bfdede78a236f5d67f780cf77709a9e5fdf +Subproject commit ec0c012561b56a908d7693a51f8db0015e1a6c30 diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader index a7598dd..ab3233f 160000 --- a/Tweaks/YouTubeHeader +++ b/Tweaks/YouTubeHeader @@ -1 +1 @@ -Subproject commit a7598dd2655792f23fbc3d33774bbfa9fd320d80 +Subproject commit ab3233f2fb7e0b350d4764ad336f60947eafd26c diff --git a/Tweaks/iSponsorBlock b/Tweaks/iSponsorBlock index 5e40019..7089a45 160000 --- a/Tweaks/iSponsorBlock +++ b/Tweaks/iSponsorBlock @@ -1 +1 @@ -Subproject commit 5e400190e06209b76e5cae50506c3d3510066476 +Subproject commit 7089a457c2eebafe76720c8bea4963e8f9685672 diff --git a/Tweaks/protobuf b/Tweaks/protobuf index 532f0c2..4a5660c 160000 --- a/Tweaks/protobuf +++ b/Tweaks/protobuf @@ -1 +1 @@ -Subproject commit 532f0c2ed52b60bc33492a2ee4cbf9c4ca960450 +Subproject commit 4a5660c889ef9eb4161dded5c2e91c46f0c30924