Skip to content

Commit c5d652a

Browse files
merge: resolve merge conflict in YtDlpClient.java (combine cookies & installer)
2 parents 6503da3 + dae3e4c commit c5d652a

12 files changed

Lines changed: 532 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install yt-dlp & FFmpeg
2626
run: |
27-
sudo sudo apt-get update
27+
sudo apt-get update
2828
sudo apt-get install -y ffmpeg
2929
sudo curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
3030
sudo chmod a+rx /usr/local/bin/yt-dlp

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies {
2222
testImplementation(platform("org.junit:junit-bom:5.10.2"))
2323
testImplementation("org.junit.jupiter:junit-jupiter")
2424
testImplementation("org.assertj:assertj-core:3.25.3")
25+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2526
}
2627

2728
tasks.test {

gradle/wrapper/gradle-wrapper.jar

47.3 KB
Binary file not shown.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
7+
validateDistributionUrl=true
8+
zipStoreBase=GRADLE_USER_HOME
9+
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)