DarkCat09/Piped-Alpine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upd backend patch; remove lines instead of commenting

Browse source
This commit is contained in:
DarkCat09 2023-07-27 12:41:00 +04:00
parent 6b043eea98
commit 82962f68a1
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend.patch
View file

@ -1,22 +1,21 @@
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 231b179..f6cd83b 100644 index edfdf66..c7cfa4d 100644
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -40,7 +40,8 @@ dependencies { @@ -40,7 +40,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp' implementation 'com.squareup.okhttp3:okhttp'
implementation 'com.squareup.okhttp3:okhttp-brotli' implementation 'com.squareup.okhttp3:okhttp-brotli'
implementation 'io.sentry:sentry:6.26.0' implementation 'io.sentry:sentry:6.27.0'
- implementation 'rocks.kavin:reqwest4j:1.0.6' - implementation 'rocks.kavin:reqwest4j:1.0.6'
+ //implementation 'rocks.kavin:reqwest4j:1.0.6'
+ implementation files('libs/reqwest4j.jar') + implementation files('libs/reqwest4j.jar')
implementation 'io.minio:minio:8.5.4' implementation 'io.minio:minio:8.5.4'
} }
diff --git a/src/main/java/me/kavin/piped/Main.java b/src/main/java/me/kavin/piped/Main.java diff --git a/src/main/java/me/kavin/piped/Main.java b/src/main/java/me/kavin/piped/Main.java
index a8647c0..3265111 100644 index a5a8b57..4f9e6ed 100644
--- a/src/main/java/me/kavin/piped/Main.java --- a/src/main/java/me/kavin/piped/Main.java
+++ b/src/main/java/me/kavin/piped/Main.java +++ b/src/main/java/me/kavin/piped/Main.java
@@ -39,7 +39,7 @@ public class Main { @@ -41,7 +41,7 @@ public class Main {
ReqwestUtils.init(Constants.REQWEST_PROXY); ReqwestUtils.init(Constants.REQWEST_PROXY);
Sentry.init(options -> { Sentry.init(options -> {

20
reqwest4j.patch
View file

@ -1,21 +1,23 @@
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 952abb5..582be0d 100644 index 4a0df70..46e6f0c 100644
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -11,7 +11,7 @@ repositories { @@ -10,10 +10,6 @@ repositories {
mavenCentral()
} }
dependencies { -dependencies {
- rust(project(":reqwest-jni")) - rust(project(":reqwest-jni"))
+ //rust(project(":reqwest-jni")) -}
} -
// javac -h // javac -h
tasks.register('generateJniHeaders', JavaCompile) {
classpath = sourceSets.main.compileClasspath
diff --git a/reqwest-jni/build.gradle.kts b/reqwest-jni/build.gradle.kts diff --git a/reqwest-jni/build.gradle.kts b/reqwest-jni/build.gradle.kts
index 189a81d..8c5895e 100644 index 189a81d..1c22153 100644
--- a/reqwest-jni/build.gradle.kts --- a/reqwest-jni/build.gradle.kts
+++ b/reqwest-jni/build.gradle.kts +++ b/reqwest-jni/build.gradle.kts
@@ -4,8 +4,10 @@ plugins { @@ -4,8 +4,8 @@ plugins {
rust { rust {
release.set(true) release.set(true)
@ -25,7 +27,5 @@ index 189a81d..8c5895e 100644
- targets += target("aarch64-unknown-linux-gnu", "libreqwest.so") - targets += target("aarch64-unknown-linux-gnu", "libreqwest.so")
- targets += target("x86_64-unknown-linux-gnu", "libreqwest.so") - targets += target("x86_64-unknown-linux-gnu", "libreqwest.so")
+ // targets += target("aarch64-unknown-linux-gnu", "libreqwest.so")
+ // targets += target("x86_64-unknown-linux-gnu", "libreqwest.so")
+ targets += target("x86_64-unknown-linux-musl", "libreqwest.so") + targets += target("x86_64-unknown-linux-musl", "libreqwest.so")
} }