Compare commits
No commits in common. "3e3042069817bb084b1bd9eb6cd2f9888380b795" and "6b043eea98ae9eb3d8c4bec83c65d90558de39b2" have entirely different histories.
3e30420698
...
6b043eea98
3 changed files with 16 additions and 19 deletions
|
@ -1,21 +1,22 @@
|
||||||
diff --git a/build.gradle b/build.gradle
|
diff --git a/build.gradle b/build.gradle
|
||||||
index edfdf66..c7cfa4d 100644
|
index 231b179..f6cd83b 100644
|
||||||
--- a/build.gradle
|
--- a/build.gradle
|
||||||
+++ b/build.gradle
|
+++ b/build.gradle
|
||||||
@@ -40,7 +40,7 @@ dependencies {
|
@@ -40,7 +40,8 @@ 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.27.0'
|
implementation 'io.sentry:sentry:6.26.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 a5a8b57..4f9e6ed 100644
|
index a8647c0..3265111 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
|
||||||
@@ -41,7 +41,7 @@ public class Main {
|
@@ -39,7 +39,7 @@ public class Main {
|
||||||
ReqwestUtils.init(Constants.REQWEST_PROXY);
|
ReqwestUtils.init(Constants.REQWEST_PROXY);
|
||||||
|
|
||||||
Sentry.init(options -> {
|
Sentry.init(options -> {
|
||||||
|
|
4
build.sh
4
build.sh
|
@ -119,10 +119,6 @@ title 'Adding reqwest4j JAR into Piped sources...'
|
||||||
cd_and_exec backend mkdir -p libs
|
cd_and_exec backend mkdir -p libs
|
||||||
cd_and_exec backend/libs mv "$REQ4J" ./
|
cd_and_exec backend/libs mv "$REQ4J" ./
|
||||||
|
|
||||||
# From GitHub Actions
|
|
||||||
title 'Creating VERSION file...'
|
|
||||||
cd_and_exec backend echo "$(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD)" >VERSION
|
|
||||||
|
|
||||||
title 'Building Piped...'
|
title 'Building Piped...'
|
||||||
cd_and_exec backend ./gradlew shadowJar
|
cd_and_exec backend ./gradlew shadowJar
|
||||||
cd_and_exec backend ./gradlew --stop
|
cd_and_exec backend ./gradlew --stop
|
||||||
|
|
|
@ -1,23 +1,21 @@
|
||||||
diff --git a/build.gradle b/build.gradle
|
diff --git a/build.gradle b/build.gradle
|
||||||
index 4a0df70..46e6f0c 100644
|
index 952abb5..582be0d 100644
|
||||||
--- a/build.gradle
|
--- a/build.gradle
|
||||||
+++ b/build.gradle
|
+++ b/build.gradle
|
||||||
@@ -10,10 +10,6 @@ repositories {
|
@@ -11,7 +11,7 @@ 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..1c22153 100644
|
index 189a81d..8c5895e 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,8 @@ plugins {
|
@@ -4,8 +4,10 @@ plugins {
|
||||||
|
|
||||||
rust {
|
rust {
|
||||||
release.set(true)
|
release.set(true)
|
||||||
|
@ -27,5 +25,7 @@ index 189a81d..1c22153 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")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue