Skip to content

Commit 868103c

Browse files
author
Jeidnx
committed
Merge branch 'master' into oidc
2 parents 5f6a83a + 07785f1 commit 868103c

35 files changed

+592
-255
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717

1818
- name: set up JDK ${{ matrix.java }}
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: ${{ matrix.java }}
2222
distribution: zulu

‎.github/workflows/docker-build-test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
matrix:
2020
docker-compose-file:
2121
- docker-compose.yml
22+
- testing/docker-compose.hsqldb.yml
2223
- testing/docker-compose.cockroachdb.yml
2324
- testing/docker-compose.yugabytedb.yml
2425
dockerfile:
@@ -35,22 +36,22 @@ jobs:
3536
fail-fast: false
3637
steps:
3738
- uses: actions/checkout@v4
38-
- uses: actions/download-artifact@v3
39+
- uses: actions/download-artifact@v4
3940
with:
4041
name: piped.jar
4142
- name: Create Version File
4243
run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
4344
- name: Build Image Locally
44-
uses: docker/build-push-action@v5
45+
uses: docker/build-push-action@v6
4546
with:
4647
context: .
4748
load: true
4849
file: ${{ matrix.dockerfile }}
4950
tags: 1337kavin/piped:latest
5051
- name: Start Docker-Compose services
51-
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
52+
run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
5253
- name: Run tests
5354
run: ./testing/api-test.sh
5455
- name: Collect services logs
5556
if: failure()
56-
run: docker-compose -f ${{ matrix.docker-compose-file }} logs
57+
run: docker compose -f ${{ matrix.docker-compose-file }} logs

‎.github/workflows/docker-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
dockerfile: ./Dockerfile.graalvm-jvm.ci
2828
steps:
2929
- uses: actions/checkout@v4
30-
- uses: actions/download-artifact@v3
30+
- uses: actions/download-artifact@v4
3131
with:
3232
name: piped.jar
3333
- name: Create Version File
@@ -47,7 +47,7 @@ jobs:
4747
username: ${{ secrets.DOCKER_USERNAME }}
4848
password: ${{ secrets.DOCKER_PASSWORD }}
4949
- name: Build and push
50-
uses: docker/build-push-action@v5
50+
uses: docker/build-push-action@v6
5151
with:
5252
context: .
5353
file: ${{ matrix.dockerfile }}

‎.github/workflows/docker-migrations-build-test.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
with:
1717
ref: ${{ github.event.pull_request.base.sha }}
1818
- name: set up JDK 21
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: 21
2222
distribution: zulu
2323
cache: "gradle"
2424
- name: Run Build
2525
run: ./gradlew shadowJar
2626
- run: mv build/libs/piped-*-all.jar piped.jar
27-
- uses: actions/upload-artifact@v3
27+
- uses: actions/upload-artifact@v4
2828
with:
2929
name: piped-old.jar
3030
path: piped.jar
@@ -50,33 +50,33 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v4
5252
- run: echo "unknown" > VERSION
53-
- uses: actions/download-artifact@v3
53+
- uses: actions/download-artifact@v4
5454
with:
5555
name: piped-old.jar
5656
- name: Build Old Image Locally
57-
uses: docker/build-push-action@v5
57+
uses: docker/build-push-action@v6
5858
with:
5959
context: .
6060
load: true
6161
file: ${{ matrix.dockerfile }}
6262
tags: 1337kavin/piped:latest
6363
- name: Start Docker-Compose services
64-
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
64+
run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
6565
- run: rm piped.jar
66-
- uses: actions/download-artifact@v3
66+
- uses: actions/download-artifact@v4
6767
with:
6868
name: piped.jar
6969
- name: Build New Image Locally
70-
uses: docker/build-push-action@v5
70+
uses: docker/build-push-action@v6
7171
with:
7272
context: .
7373
load: true
7474
file: ${{ matrix.dockerfile }}
7575
tags: 1337kavin/piped:latest
7676
- name: Start Docker-Compose services
77-
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
77+
run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
7878
- name: Run tests
7979
run: ./testing/api-test.sh
8080
- name: Collect services logs
8181
if: failure()
82-
run: docker-compose -f ${{ matrix.docker-compose-file }} logs
82+
run: docker compose -f ${{ matrix.docker-compose-file }} logs

‎.github/workflows/fat-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
- uses: actions/checkout@v4
1111

1212
- name: set up JDK 21
13-
uses: actions/setup-java@v3
13+
uses: actions/setup-java@v4
1414
with:
1515
java-version: 21
1616
distribution: zulu
1717
cache: "gradle"
1818
- name: Run Build
1919
run: ./gradlew shadowJar
2020
- run: mv build/libs/piped-*-all.jar piped.jar
21-
- uses: actions/upload-artifact@v3
21+
- uses: actions/upload-artifact@v4
2222
with:
2323
name: piped.jar
2424
path: piped.jar

‎build.gradle‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,43 @@ repositories {
1010
}
1111

1212
dependencies {
13-
implementation 'org.apache.commons:commons-lang3:3.13.0'
14-
implementation 'org.apache.commons:commons-text:1.10.0'
15-
implementation 'commons-io:commons-io:2.14.0'
16-
implementation 'it.unimi.dsi:fastutil-core:8.5.12'
17-
implementation 'commons-codec:commons-codec:1.16.0'
18-
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
19-
implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:48beff184a9792c4787cfa05fce577c3adf89f56'
13+
implementation 'org.apache.commons:commons-lang3:3.14.0'
14+
implementation 'org.apache.commons:commons-text:1.12.0'
15+
implementation 'commons-io:commons-io:2.16.1'
16+
implementation 'it.unimi.dsi:fastutil-core:8.5.13'
17+
implementation 'commons-codec:commons-codec:1.17.0'
18+
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
19+
implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:a64e202bb498032e817a702145263590829f3c1d'
2020
implementation 'com.github.FireMasterK:nanojson:9f4af3b739cc13f3d0d9d4b758bbe2b2ae7119d7'
2121
implementation 'com.nimbusds:oauth2-oidc-sdk:11.5'
22-
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
23-
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
24-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
22+
implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'
23+
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.2'
24+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
2525
implementation 'com.rometools:rome:2.1.0'
2626
implementation 'com.rometools:rome-modules:2.1.0'
27-
implementation 'org.jsoup:jsoup:1.16.1'
27+
implementation 'org.jsoup:jsoup:1.18.1'
2828
implementation 'io.activej:activej-common:5.5'
2929
implementation 'io.activej:activej-http:5.5'
3030
implementation 'io.activej:activej-boot:5.5'
3131
implementation 'io.activej:activej-specializer:5.5'
3232
implementation 'io.activej:activej-launchers-http:5.5'
33-
implementation 'org.postgresql:postgresql:42.6.0'
34-
implementation 'org.hibernate:hibernate-core:6.3.1.Final'
35-
implementation 'org.hibernate:hibernate-hikaricp:6.3.1.Final'
36-
implementation 'org.liquibase:liquibase-core:4.23.2'
37-
implementation('org.liquibase.ext:liquibase-yugabytedb:4.23.2') { exclude group: 'org.liquibase' }
38-
implementation 'com.zaxxer:HikariCP:5.0.1'
39-
implementation 'org.springframework.security:spring-security-crypto:6.1.4'
40-
implementation 'commons-logging:commons-logging:1.2'
41-
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.11.0"))
33+
implementation 'org.hsqldb:hsqldb:2.7.3'
34+
implementation 'org.postgresql:postgresql:42.7.3'
35+
implementation 'org.hibernate:hibernate-core:6.4.1.Final'
36+
implementation 'org.hibernate:hibernate-hikaricp:6.4.1.Final'
37+
implementation 'org.liquibase:liquibase-core:4.28.0'
38+
implementation('org.liquibase.ext:liquibase-yugabytedb:4.28.0') { exclude group: 'org.liquibase' }
39+
implementation 'com.zaxxer:HikariCP:5.1.0'
40+
implementation 'org.springframework.security:spring-security-crypto:6.3.1'
41+
implementation 'commons-logging:commons-logging:1.3.3'
42+
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
4243
implementation 'com.squareup.okhttp3:okhttp'
4344
implementation 'com.squareup.okhttp3:okhttp-brotli'
44-
implementation 'io.sentry:sentry:6.30.0'
45-
implementation 'rocks.kavin:reqwest4j:1.0.12'
46-
implementation 'io.minio:minio:8.5.6'
47-
compileOnly 'org.projectlombok:lombok:1.18.30'
48-
annotationProcessor 'org.projectlombok:lombok:1.18.30'
45+
implementation 'io.sentry:sentry:7.11.0'
46+
implementation 'rocks.kavin:reqwest4j:1.0.14'
47+
implementation 'io.minio:minio:8.5.11'
48+
compileOnly 'org.projectlombok:lombok:1.18.34'
49+
annotationProcessor 'org.projectlombok:lombok:1.18.34'
4950
}
5051

5152
shadowJar {
@@ -60,7 +61,10 @@ jar {
6061
}
6162
}
6263

64+
java {
65+
sourceCompatibility = JavaVersion.VERSION_21
66+
targetCompatibility = JavaVersion.VERSION_21
67+
}
68+
6369
group = 'me.kavin.piped'
6470
version = '1.0'
65-
sourceCompatibility = JavaVersion.VERSION_21
66-
targetCompatibility = JavaVersion.VERSION_21

‎config.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ HTTP_WORKERS:2
66
# Proxy
77
PROXY_PART:https://pipedproxy-cdg.kavin.rocks
88

9+
# Proxy Hash Secret
10+
#PROXY_HASH_SECRET:INSERT_HERE
11+
912
# Outgoing proxy to be used by reqwest4j - eg: socks5://127.0.0.1:1080
1013
#REQWEST_PROXY: socks5://127.0.0.1:1080
1114
# Optional proxy username and password
@@ -53,6 +56,10 @@ DISABLE_LBRY:false
5356
# How long should unauthenticated subscriptions last for
5457
SUBSCRIPTIONS_EXPIRY:30
5558

59+
# Send consent accepted cookie
60+
# This is required for certain features to work in some countries
61+
CONSENT_COOKIE:true
62+
5663
# Sentry DSN
5764
# Use Sentry to log errors and trace performance
5865
#SENTRY_DSN:INSERT_HERE

‎gradle/wrapper/gradle-wrapper.jar‎

-19.7 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)