Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Playwright #643

Merged
merged 2 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dex2jar = "v64" # Stuck until https://github.com/ThexXTURBOXx/dex2jar/issues/27
rhino = "1.7.14"
settings = "1.0.0-RC"
twelvemonkeys = "3.9.4"
playwright = "1.28.0"
graphqlkotlin = "6.5.6"
xmlserialization = "0.86.2"
ktlint = "1.0.0"
Expand Down Expand Up @@ -108,9 +107,6 @@ zip4j = "net.lingala.zip4j:zip4j:2.11.5"
commonscompress = "org.apache.commons:commons-compress:1.24.0"
junrar = "com.github.junrar:junrar:7.5.5"

# CloudflareInterceptor
playwright = { module = "com.microsoft.playwright:playwright", version.ref = "playwright" }

# AES/CBC/PKCS7Padding Cypher provider
bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.76"

Expand Down
22 changes: 0 additions & 22 deletions scripts/bundler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ main() {
set -- "${POSITIONAL_ARGS[@]}"

OS="$1"
PLAYWRIGHT_VERSION="$(cat gradle/libs.versions.toml | grep -oP "playwright = \"\K([0-9\.]*)(?=\")")"
PLAYWRIGHT_REVISION="$(curl --silent "https://raw.githubusercontent.com/microsoft/playwright/v$PLAYWRIGHT_VERSION/packages/playwright-core/browsers.json" 2>&1 | grep -ozP "\"name\": \"chromium\",\n *\"revision\": \"\K[0-9]*")"
JAR="$(ls server/build/*.jar | tail -n1)"
RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
RELEASE_VERSION="$(tmp="${JAR%-*}"; echo "${tmp##*-}" | tr -d v)"
Expand Down Expand Up @@ -61,9 +59,6 @@ main() {
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
download_jre_and_electron

PLAYWRIGHT_PLATFORM="linux"
setup_playwright

RELEASE="$RELEASE_NAME.tar.gz"
make_linux_bundle
move_release_to_output_dir
Expand All @@ -77,9 +72,6 @@ main() {
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
download_jre_and_electron

PLAYWRIGHT_PLATFORM="mac"
setup_playwright

RELEASE="$RELEASE_NAME.zip"
make_macos_bundle
move_release_to_output_dir
Expand All @@ -93,9 +85,6 @@ main() {
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
download_jre_and_electron

PLAYWRIGHT_PLATFORM="mac-arm64"
setup_playwright

RELEASE="$RELEASE_NAME.zip"
make_macos_bundle
move_release_to_output_dir
Expand All @@ -109,9 +98,6 @@ main() {
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
download_jre_and_electron

PLAYWRIGHT_PLATFORM="win64"
setup_playwright

RELEASE="$RELEASE_NAME.zip"
make_windows_bundle
move_release_to_output_dir
Expand All @@ -129,9 +115,6 @@ main() {
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
download_jre_and_electron

PLAYWRIGHT_PLATFORM="win64"
setup_playwright

RELEASE="$RELEASE_NAME.zip"
make_windows_bundle
move_release_to_output_dir
Expand Down Expand Up @@ -295,11 +278,6 @@ make_windows_package() {
"$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE"
}

setup_playwright() {
mkdir "$RELEASE_NAME/bin"
curl -L "https://playwright.azureedge.net/builds/chromium/$PLAYWRIGHT_REVISION/chromium-$PLAYWRIGHT_PLATFORM.zip" -o "$RELEASE_NAME/bin/chromium.zip"
}

# Error handler
# set -u: Treat unset variables as an error when substituting.
# set -o pipefail: Prevents errors in pipeline from being masked.
Expand Down
3 changes: 0 additions & 3 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ dependencies {
implementation(libs.commonscompress)
implementation(libs.junrar)

// CloudflareInterceptor
implementation(libs.playwright)

// AES/CBC/PKCS7Padding Cypher provider for zh.copymanga
implementation(libs.bouncycastle)

Expand Down
212 changes: 0 additions & 212 deletions server/src/main/java/suwayomi/tachidesk/server/util/DriverJar.java

This file was deleted.

Loading