Update Build.ps1

Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>

.github/workflows/Build.yml

@@ -28,10 +28,6 @@ jobs:
         run: |
           . Scripts\ReVanced_Patches.ps1
 
-      - name: Download ReVanced Integrations
-        run: |
-          . Scripts\ReVanced_Intergrations.ps1
-
       - name: Download Vanced MicroG
         run: |
           . Scripts\MicroG.ps1
@@ -46,12 +42,11 @@ jobs:
 
           & $JavaPath `
           -jar "Temp\revanced-cli.jar" patch `
-          --patch-bundle "Temp\revanced-patches.jar" `
-          --merge "Temp\revanced-integrations.apk" `
-          --exclude "Always repeat" `
-          --exclude "Hide captions button" `
-          --exclude "Hide timestamp" `
-          --exclude "Hide seekbar" `
+          --patches "Temp\revanced-patches.rvp" `
+          --disable "Always repeat" `
+          --disable "Disable auto captions" `
+          --disable "Hide timestamp" `
+          --disable "Hide seekbar" `
           --purge `
           --out "Temp\revanced.apk" `
           "Temp\youtube.apk"
@@ -71,14 +66,14 @@ jobs:
         id: read_release
         run: |
           # https://en.wikipedia.org/wiki/Percent-encoding
-          (Get-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Raw).replace("YouTubeTag", "${{ env.LatestSupportedYT }}").replace("CLITag", "${{ env.CLIvtag }}").replace("PatchesTag", "${{ env.Patchesvtag }}").replace("IntegrationsTag", "${{ env.IntegrationsTag }}").replace("MicroGTag", "${{ env.MicroGTag }}").replace("ZuluTag", "${{ env.ZuluTag }}") | Set-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Force
+          (Get-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Raw).replace("YouTubeTag", "${{ env.LatestSupportedYT }}").replace("CLITag", "${{ env.CLIvtag }}").replace("PatchesTag", "${{ env.Patchesvtag }}").replace("MicroGTag", "${{ env.MicroGTag }}").replace("ZuluTag", "${{ env.ZuluTag }}") | Set-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Force
           # https://trstringer.com/github-actions-multiline-strings/
           Add-Content -Path $env:GITHUB_OUTPUT -Value "ReleaseBody=ReleaseNotesTemplate.md"
           $ReleaseName = Get-Date -f "yyyy.MM.dd"
           echo "RELEASE_NAME=$ReleaseName" >> $env:GITHUB_ENV
 
       - name: Upload to Releases
-        uses: softprops/action-gh-release@master
+        uses: softprops/action-gh-release@v2.2.1
         with:
           tag_name: ${{ env.RELEASE_NAME }}
           body_path: ${{ steps.read_release.outputs.ReleaseBody }}

Build.ps1

@@ -28,21 +28,24 @@ if ($Host.Version.Major -eq 5)
 }
 
 # Download all files to "Script location folder\ReVanced"
-$WorkingFolder = Split-Path $MyInvocation.MyCommand.Path -Parent
-if (-not (Test-Path -Path "$WorkingFolder\ReVanced"))
+$CurrentFolder = Split-Path $MyInvocation.MyCommand.Path -Parent
+if (-not (Test-Path -Path "$CurrentFolder\ReVanced"))
 {
-    New-Item -Path "$WorkingFolder\ReVanced" -ItemType Directory -Force
+    New-Item -Path "$CurrentFolder\ReVanced" -ItemType Directory -Force
 }
 
 # Get the latest supported YouTube version to patch
-# https://api.revanced.app/docs/swagger
+# https://api.revanced.app
 $Parameters = @{
-    Uri             = "https://api.revanced.app/v2/patches/latest"
+    Uri             = "https://api.revanced.app/v4/patches/list"
     UseBasicParsing = $true
 }
-$JSON = (Invoke-RestMethod @Parameters).patches
-$versions = ($JSON | Where-Object -FilterScript {$_.compatiblePackages.name -eq "com.google.android.youtube"}).compatiblePackages.versions
-$LatestSupported = $versions | Sort-Object -Descending -Unique | Select-Object -First 1
+$JSON = (Invoke-Webrequest @Parameters).Content | ConvertFrom-Json
+$versions = ($JSON | Where-Object -FilterScript {$_.name -eq "Video ads"})
+$LatestSupported = $versions.compatiblePackages.'com.google.android.youtube' | Sort-Object -Descending -Unique | Select-Object -First 1
+
+Write-Verbose -Message "" -Verbose
+Write-Verbose -Message "Downloading the latest supported YouTube apk" -Verbose
 
 # We need a NON-bundle version
 <#
@@ -56,7 +59,7 @@ $URL = (Invoke-Webrequest @Parameters).Links.href | Where-Object -FilterScript {
 
 $Parameters = @{
     Uri             = $URL
-    OutFile         = "$WorkingFolder\ReVanced\youtube.apk"
+    OutFile         = "$CurrentFolder\ReVanced\youtube.apk"
     UseBasicParsing = $true
     Verbose         = $true
 }
@@ -64,7 +67,7 @@ Invoke-Webrequest @Parameters
 #>
 
 # https://www.apkmirror.com/apk/google-inc/youtube/
-$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/"
+$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported.replace('.', '-'))-release/"
 $Parameters = @{
     Uri             = $apkMirrorLink
     UseBasicParsing = $false # Disabled
@@ -104,12 +107,14 @@ $URL_Part = $URL_Part.Replace("&amp;", "&")
 # Finally, get the real link
 $Parameters = @{
     Uri             = "https://www.apkmirror.com$URL_Part"
-    OutFile         = "$WorkingFolder\ReVanced\youtube.apk"
+    OutFile         = "$CurrentFolder\ReVanced\youtube.apk"
     UseBasicParsing = $true
     Verbose         = $true
 }
 Invoke-Webrequest @Parameters
 
+Write-Verbose -Message "" -Verbose
+Write-Verbose -Message "Downloading ReVanced CLI" -Verbose
 # https://github.com/revanced/revanced-cli
 $Parameters = @{
     Uri             = "https://api.github.com/repos/revanced/revanced-cli/releases/latest"
@@ -119,42 +124,31 @@ $Parameters = @{
 $URL = ((Invoke-RestMethod @Parameters).assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
 $Parameters = @{
     Uri             = $URL
-    Outfile         = "$WorkingFolder\ReVanced\revanced-cli.jar"
+    Outfile         = "$CurrentFolder\ReVanced\revanced-cli.jar"
     UseBasicParsing = $true
     Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
+Write-Verbose -Message "" -Verbose
+Write-Verbose -Message "Downloading ReVanced patches" -Verbose
 # https://github.com/revanced/revanced-patches
 $Parameters = @{
     Uri             = "https://api.github.com/repos/revanced/revanced-patches/releases/latest"
     UseBasicParsing = $true
     Verbose         = $true
 }
-$URL = ((Invoke-RestMethod @Parameters).assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
+$URL = ((Invoke-RestMethod @Parameters).assets | Where-Object -FilterScript {$_.content_type -eq "text/plain"}).browser_download_url
 $Parameters = @{
     Uri             = $URL
-    Outfile         = "$WorkingFolder\ReVanced\revanced-patches.jar"
-    UseBasicParsing = $true
-    Verbose         = $true
-}
-Invoke-RestMethod @Parameters
-
-# https://github.com/revanced/revanced-integrations
-$Parameters = @{
-    Uri             = "https://api.github.com/repos/revanced/revanced-integrations/releases/latest"
-    UseBasicParsing = $true
-    Verbose         = $true
-}
-$URL = ((Invoke-RestMethod @Parameters).assets | Where-Object -FilterScript {$_.content_type -eq "application/vnd.android.package-archive"}).browser_download_url
-$Parameters = @{
-    Uri             = $URL
-    Outfile         = "$WorkingFolder\ReVanced\revanced-integrations.apk"
+    Outfile         = "$CurrentFolder\ReVanced\revanced-patches.rvp"
     UseBasicParsing = $true
     Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
+Write-Verbose -Message "" -Verbose
+Write-Verbose -Message "Downloading ReVanced GmsCore" -Verbose
 # https://github.com/ReVanced/GmsCore
 $Parameters = @{
     Uri             = "https://api.github.com/repos/ReVanced/GmsCore/releases/latest"
@@ -170,7 +164,7 @@ foreach($url in $URL) {
     }
     $Parameters = @{
         Uri             = $url.browser_download_url
-        Outfile         = "$WorkingFolder\ReVanced\$($url.name)"
+        Outfile         = "$CurrentFolder\ReVanced\$($url.name)"
         UseBasicParsing = $true
         Verbose         = $true
     }
@@ -178,11 +172,13 @@ foreach($url in $URL) {
 }
 
 # Sometimes older version of zulu-jdk causes conflict, so remove older version before proceeding.
-if (Test-Path -Path "$WorkingFolder\ReVanced\jdk")
+if (Test-Path -Path "$CurrentFolder\ReVanced\jdk")
 {
-    Remove-Item -Path "$WorkingFolder\ReVanced\jdk" -Recurse -Force
+    Remove-Item -Path "$CurrentFolder\ReVanced\jdk" -Recurse -Force
 }
 
+Write-Verbose -Message "" -Verbose
+Write-Verbose -Message "Downloading Azul Zulu" -Verbose
 # https://github.com/ScoopInstaller/Java/blob/master/bucket/zulu-jdk.json
 $Parameters = @{
     Uri             = "https://raw.githubusercontent.com/ScoopInstaller/Java/master/bucket/zulu-jdk.json"
@@ -192,7 +188,7 @@ $Parameters = @{
 $URL = (Invoke-RestMethod @Parameters).architecture."64bit".url
 $Parameters = @{
     Uri             = $URL
-    Outfile         = "$WorkingFolder\ReVanced\jdk_windows-x64_bin.zip"
+    Outfile         = "$CurrentFolder\ReVanced\jdk_windows-x64_bin.zip"
     UseBasicParsing = $true
     Verbose         = $true
 }
@@ -200,33 +196,41 @@ Invoke-RestMethod @Parameters
 
 # Expand jdk_windows-x64_bin archive
 $Parameters = @{
-    Path            = "$WorkingFolder\ReVanced\jdk_windows-x64_bin.zip"
-    DestinationPath = "$WorkingFolder\ReVanced\jdk"
+    Path            = "$CurrentFolder\ReVanced\jdk_windows-x64_bin.zip"
+    DestinationPath = "$CurrentFolder\ReVanced\jdk"
     Force           = $true
     Verbose         = $true
 }
 Expand-Archive @Parameters
 
-Remove-Item -Path "$WorkingFolder\ReVanced\jdk_windows-x64_bin.zip" -Force
+Remove-Item -Path "$CurrentFolder\ReVanced\jdk_windows-x64_bin.zip" -Force
 
 # Let's create patched APK
-& "$WorkingFolder\ReVanced\jdk\zulu*win_x64\bin\java.exe" `
--jar "$WorkingFolder\ReVanced\revanced-cli.jar" patch `
---patch-bundle "$WorkingFolder\ReVanced\revanced-patches.jar" `
---merge "$WorkingFolder\ReVanced\revanced-integrations.apk" `
---exclude "Always repeat" `
---exclude "Hide captions button" `
---exclude "Hide timestamp" `
---exclude "Hide seekbar" `
+& "$CurrentFolder\ReVanced\jdk\zulu*win_x64\bin\java.exe" `
+-jar "$CurrentFolder\ReVanced\revanced-cli.jar" patch `
+--patches "$CurrentFolder\ReVanced\revanced-patches.rvp" `
+--disable "Always repeat" `
+--disable "Disable auto captions" `
+--disable "Hide timestamp" `
+--disable "Hide seekbar" `
 --purge `
---temporary-files-path "$WorkingFolder\ReVanced\Temp" `
---out "$WorkingFolder\ReVanced\revanced.apk" `
-"$WorkingFolder\ReVanced\youtube.apk"
+--temporary-files-path "$CurrentFolder\ReVanced\Temp" `
+--out "$CurrentFolder\ReVanced\revanced.apk" `
+"$CurrentFolder\ReVanced\youtube.apk"
 
 # Open working directory with builded files
-# Invoke-Item -Path "$WorkingFolder\ReVanced"
+# Invoke-Item -Path "$CurrentFolder\ReVanced"
 
 # Remove temp directory, because cli failed to clean up directory
-# Remove-Item -Path "$WorkingFolder\ReVanced\Temp" -Recurse -Force -Confirm:$false
+# Remove-Item -Path "$CurrentFolder\ReVanced\Temp" -Recurse -Force -Confirm:$false
 
-Write-Warning -Message "Latest available revanced.apk & microg.apk are ready in `"$WorkingFolder\ReVanced`""
+$Files = @(
+    "$CurrentFolder\ReVanced\Temp",
+    "$CurrentFolder\ReVanced\jdk",
+    "$CurrentFolder\ReVanced\revanced-cli.jar",
+    "$CurrentFolder\ReVanced\revanced-patches.rvp",
+    "$CurrentFolder\ReVanced\youtube.apk"
+)
+Remove-Item -Path $Files -Recurse -Force
+
+Write-Warning -Message "Latest available revanced.apk & microg.apk are ready in `"$CurrentFolder\ReVanced`""

README.md

@@ -14,7 +14,7 @@ Build ReVanced package (.apk) easily than ever using latest ReVanced patches and
   * hide-captions-button
   * hide-timestamp
   * hide-seekbar
-* The script downloads latest available YouTube package (having parsed [ReVanced API](https://api.revanced.app/v2/patches/latest)) supported by ReVanced Team from <https://apkpure.net> and all dependencies and build package using [Zulu JDK](https://www.azul.com/downloads/?package=jdk);
+* The script downloads latest available YouTube package (having parsed [ReVanced API](https://api.revanced.app/v4/patches/list)) supported by ReVanced Team from [APKMirror](https://apkmirror.com) and all dependencies and build package using [Zulu JDK](https://www.azul.com/downloads/?package=jdk);
 * Script installs no apps — everything will be held in your `Script location folder\ReVanced`;
 * After compiling you get `revanced.apk` & `microg.apk` ready to be installed;
 * Release notes are generated dynamically using the [ReleaseNotesTemplate.md](https://github.com/JDM170/ReVanced_Builder/blob/main/ReleaseNotesTemplate.md) template.
@@ -30,7 +30,8 @@ Trigger the [`Build`](https://github.com/JDM170/ReVanced_Builder/actions/workflo
 ## Requirements if you compile locally
 
 * Windows 10 x64 or Windows 11
-* Windows PowerShell 5.1/7
+* Windows PowerShell 5.1
+  * if you want to use PowerShell 7, you will have to install a 3rd party HTML parser ([AngleSharp](https://github.com/AngleSharp/AngleSharp))
 
 ## Links
 
@@ -38,7 +39,6 @@ Trigger the [`Build`](https://github.com/JDM170/ReVanced_Builder/actions/workflo
 * [APKMirror](https://apkmirror.com)
 * [ReVanced CLI](https://github.com/revanced/revanced-cli)
 * [ReVanced Patches](https://github.com/revanced/revanced-patches)
-* [ReVanced Integrations](https://github.com/revanced/revanced-integrations)
 * [ReVanced MicroG](https://github.com/ReVanced/GmsCore)
 * [AngleSharp](https://github.com/AngleSharp/AngleSharp)
 * [Zulu JDK](https://github.com/ScoopInstaller/Java)

ReleaseNotesTemplate.md

@@ -3,6 +3,5 @@
 * YouTube YouTubeTag;
 * ReVanced CLI CLITag;
 * ReVanced Patches PatchesTag;
-* ReVanced Integrations IntegrationsTag;
 * ReVanced MicroG MicroGTag;
 * Azul Zulu ZuluTag.

Scripts/ReVanced_Intergrations.ps1

@@ -1,18 +0,0 @@
-# https://github.com/revanced/revanced-integrations
-$Parameters = @{
-    Uri             = "https://api.github.com/repos/revanced/revanced-integrations/releases/latest"
-    UseBasicParsing = $true
-    Verbose         = $true
-}
-$apiResult = Invoke-RestMethod @Parameters
-$URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "application/vnd.android.package-archive"}).browser_download_url
-$TAG = $apiResult.tag_name
-$Parameters = @{
-    Uri             = $URL
-    Outfile         = "Temp\revanced-integrations.apk"
-    UseBasicParsing = $true
-    Verbose         = $true
-}
-Invoke-RestMethod @Parameters
-
-echo "IntegrationsTag=$TAG" >> $env:GITHUB_ENV

Scripts/ReVanced_Patches.ps1

@@ -5,11 +5,11 @@ $Parameters = @{
     Verbose         = $true
 }
 $apiResult = Invoke-RestMethod @Parameters
-$URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
+$URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "text/plain"}).browser_download_url
 $TAG = $apiResult.tag_name
 $Parameters = @{
     Uri             = $URL
-    Outfile         = "Temp\revanced-patches.jar"
+    Outfile         = "Temp\revanced-patches.rvp"
     UseBasicParsing = $true
     Verbose         = $true
 }

Scripts/YouTube.ps1

@@ -1,12 +1,12 @@
 # Get the latest supported YouTube version to patch
 # https://api.revanced.app/docs/swagger
 $Parameters = @{
-    Uri             = "https://api.revanced.app/v2/patches/latest"
+    Uri             = "https://api.revanced.app/v4/patches/list"
     UseBasicParsing = $true
 }
-$JSON = (Invoke-RestMethod @Parameters).patches
-$versions = ($JSON | Where-Object -FilterScript {$_.compatiblePackages.name -eq "com.google.android.youtube"}).compatiblePackages.versions
-$LatestSupported = $versions | Sort-Object -Descending -Unique | Select-Object -First 1
+$JSON = (Invoke-Webrequest @Parameters).Content | ConvertFrom-Json
+$versions = ($JSON | Where-Object -FilterScript {$_.name -eq "Video ads"})
+$LatestSupported = $versions.compatiblePackages.'com.google.android.youtube' | Sort-Object -Descending -Unique | Select-Object -First 1
 
 # We need a NON-bundle version
 # https://apkpure.net/ru/youtube/com.google.android.youtube/versions
@@ -35,7 +35,7 @@ $angleparser = New-Object -TypeName AngleSharp.Html.Parser.HtmlParser
 
 # Trying to find correct APK link (not BUNDLE)
 # https://www.apkmirror.com/apk/google-inc/youtube/
-$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/"
+$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported.replace('.', '-'))-release/"
 $Parameters = @{
     Uri             = $apkMirrorLink
     UseBasicParsing = $false # Disabled