diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index cc43678..2d9eb4f 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -83,6 +83,9 @@ jobs: ref: master path: theos-jailed submodules: recursive + + - name: Set PATH environment variable + run: echo "$(brew --prefix make)/libexec/gnubin" >> $GITHUB_PATH - name: Install Theos Jailed run: | @@ -99,6 +102,10 @@ jobs: 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 YOUTUBE_URL: ${{ inputs.decrypted_youtube_url }} diff --git a/.gitmodules b/.gitmodules index dd563b6..9ea04dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,9 +35,6 @@ [submodule "Tweaks/DontEatMyContent"] path = Tweaks/DontEatMyContent url = https://github.com/therealFoxster/DontEatMyContent.git -[submodule "Tweaks/YTLite"] - path = Tweaks/YTLite - url = https://github.com/dayanch96/YTLite [submodule "Extensions"] path = Extensions url = https://github.com/CokePokes/YoutubeExtensions.git diff --git a/Makefile b/Makefile index e7db477..df5f81f 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ MODULES = jailed FINALPACKAGE = 1 CODESIGN_IPA = 0 PACKAGE_VERSION = X.X.X-X.X +YTLITE_VERSION = 4.0 TWEAK_NAME = YTLitePlus DISPLAY_NAME = YouTube @@ -12,7 +13,7 @@ BUNDLE_ID = com.google.ios.youtube EXTRA_CFLAGS := $(addprefix -I,$(shell find Tweaks/FLEX -name '*.h' -exec dirname {} \;)) -I$(THEOS_PROJECT_DIR)/Tweaks -YTLitePlus_INJECT_DYLIBS = .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YTABConfig.dylib .theos/obj/YouMute.dylib .theos/obj/DontEatMyContent.dylib .theos/obj/YTHoldForSpeed.dylib .theos/obj/YTLite.dylib .theos/obj/YTVideoOverlay.dylib .theos/obj/YouGroupSettings.dylib .theos/obj/YouQuality.dylib +YTLitePlus_INJECT_DYLIBS = Tweaks/YTLite/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YTABConfig.dylib .theos/obj/YouMute.dylib .theos/obj/DontEatMyContent.dylib .theos/obj/YTHoldForSpeed.dylib .theos/obj/YTVideoOverlay.dylib .theos/obj/YouGroupSettings.dylib .theos/obj/YouQuality.dylib YTLitePlus_FILES = YTLitePlus.xm $(shell find Source -name '*.xm' -o -name '*.x' -o -name '*.m') $(shell find Tweaks/FLEX -type f \( -iname \*.c -o -iname \*.m -o -iname \*.mm \)) YTLitePlus_IPA = ./tmp/Payload/YouTube.app YTLitePlus_CFLAGS = -fobjc-arc -Wno-deprecated-declarations -Wno-unsupported-availability-guard -Wno-unused-but-set-variable -DTWEAK_VERSION=$(PACKAGE_VERSION) $(EXTRA_CFLAGS) @@ -20,13 +21,18 @@ YTLitePlus_FRAMEWORKS = UIKit Security include $(THEOS)/makefiles/common.mk include $(THEOS_MAKE_PATH)/tweak.mk -SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouMute Tweaks/DontEatMyContent Tweaks/YTLite Tweaks/YTHoldForSpeed Tweaks/YTVideoOverlay Tweaks/YouQuality Tweaks/YouGroupSettings +SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouMute Tweaks/DontEatMyContent Tweaks/YTHoldForSpeed Tweaks/YTVideoOverlay Tweaks/YouQuality Tweaks/YouGroupSettings include $(THEOS_MAKE_PATH)/aggregate.mk +YTLITE_PATH = Tweaks/YTLite +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/ \; - @cp -R Tweaks/YTLite/layout/Library/Application\ Support/YTLite.bundle Resources/ + @cp -R Tweaks/YTLite/var/jb/Library/Application\ Support/YTLite.bundle Resources/ @cp -R Tweaks/YTUHD/layout/Library/Application\ Support/YTUHD.bundle Resources/ @cp -R Tweaks/YouPiP/layout/Library/Application\ Support/YouPiP.bundle Resources/ @cp -R Tweaks/Return-YouTube-Dislikes/layout/Library/Application\ Support/RYD.bundle Resources/ @@ -41,4 +47,17 @@ before-package:: @echo -e "==> \033[1mChanging the installation path of dylibs...\033[0m" @ldid -r .theos/obj/iSponsorBlock.dylib && install_name_tool -change /usr/lib/libcolorpicker.dylib @rpath/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib @codesign --remove-signature .theos/obj/libcolorpicker.dylib && install_name_tool -change /Library/Frameworks/Alderis.framework/Alderis @rpath/Alderis.framework/Alderis .theos/obj/libcolorpicker.dylib - + +internal-clean:: + @rm -rf $(YTLITE_PATH)/* + +before-all:: + @if [[ ! -f $(YTLITE_DEB) ]]; then \ + rm -rf $(YTLITE_PATH)/*; \ + $(PRINT_FORMAT_BLUE) "Downloading YTLite"; \ + 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 \ + $(PRINT_FORMAT_ERROR) "Failed to extract YTLite"; exit 1; \ + fi; \ + fi \ No newline at end of file diff --git a/Tweaks/YTLite b/Tweaks/YTLite deleted file mode 160000 index 9b3a310..0000000 --- a/Tweaks/YTLite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9b3a31068f34bb16b4ecd9d5f6f78933801757b5 diff --git a/Tweaks/YTLite/.gitkeep b/Tweaks/YTLite/.gitkeep new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/Tweaks/YTLite/.gitkeep @@ -0,0 +1 @@ +