-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into fix-download-failure-handling-bug
- Loading branch information
Showing
303 changed files
with
6,250 additions
and
2,635 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,17 +17,17 @@ jobs: | |
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-node@v3 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 16 | ||
|
|
||
| - name: Install probe-image-size | ||
| run: npm i [email protected] --ignore-scripts | ||
|
|
||
| - name: Minimize simple images | ||
| uses: actions/github-script@v6 | ||
| uses: actions/github-script@v7 | ||
| timeout-minutes: 3 | ||
| with: | ||
| script: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,16 +12,16 @@ plugins { | |
| } | ||
|
|
||
| android { | ||
| compileSdk 33 | ||
| compileSdk 34 | ||
| namespace 'org.schabi.newpipe' | ||
|
|
||
| defaultConfig { | ||
| applicationId "org.schabi.newpipe" | ||
| resValue "string", "app_name", "NewPipe" | ||
| minSdk 21 | ||
| targetSdk 33 | ||
| versionCode 994 | ||
| versionName "0.25.2" | ||
| versionCode 996 | ||
| versionName "0.26.1" | ||
|
|
||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
|
|
||
|
|
@@ -98,17 +98,19 @@ android { | |
| resources { | ||
| // remove two files which belong to jsoup | ||
| // no idea how they ended up in the META-INF dir... | ||
| excludes += ['META-INF/README.md', 'META-INF/CHANGES'] | ||
| excludes += ['META-INF/README.md', 'META-INF/CHANGES', | ||
| // 'COPYRIGHT' belongs to RxJava... | ||
| 'META-INF/COPYRIGHT'] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| ext { | ||
| checkstyleVersion = '10.12.1' | ||
|
|
||
| androidxLifecycleVersion = '2.5.1' | ||
| androidxRoomVersion = '2.5.2' | ||
| androidxWorkVersion = '2.7.1' | ||
| androidxLifecycleVersion = '2.6.2' | ||
| androidxRoomVersion = '2.6.1' | ||
| androidxWorkVersion = '2.8.1' | ||
|
|
||
| icepickVersion = '3.2.0' | ||
| exoPlayerVersion = '2.18.7' | ||
|
|
@@ -118,7 +120,6 @@ ext { | |
|
|
||
| leakCanaryVersion = '2.12' | ||
| stethoVersion = '1.6.0' | ||
| mockitoVersion = '4.0.0' | ||
| } | ||
|
|
||
| configurations { | ||
|
|
@@ -133,7 +134,7 @@ checkstyle { | |
| toolVersion = checkstyleVersion | ||
| } | ||
|
|
||
| task runCheckstyle(type: Checkstyle) { | ||
| tasks.register('runCheckstyle', Checkstyle) { | ||
| source 'src' | ||
| include '**/*.java' | ||
| exclude '**/gen/**' | ||
|
|
@@ -154,7 +155,7 @@ task runCheckstyle(type: Checkstyle) { | |
| def outputDir = "${project.buildDir}/reports/ktlint/" | ||
| def inputFiles = project.fileTree(dir: "src", include: "**/*.kt") | ||
|
|
||
| task runKtlint(type: JavaExec) { | ||
| tasks.register('runKtlint', JavaExec) { | ||
| inputs.files(inputFiles) | ||
| outputs.dir(outputDir) | ||
| getMainClass().set("com.pinterest.ktlint.Main") | ||
|
|
@@ -163,7 +164,7 @@ task runKtlint(type: JavaExec) { | |
| jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED") | ||
| } | ||
|
|
||
| task formatKtlint(type: JavaExec) { | ||
| tasks.register('formatKtlint', JavaExec) { | ||
| inputs.files(inputFiles) | ||
| outputs.dir(outputDir) | ||
| getMainClass().set("com.pinterest.ktlint.Main") | ||
|
|
@@ -189,15 +190,15 @@ sonar { | |
|
|
||
| dependencies { | ||
| /** Desugaring **/ | ||
| coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.3' | ||
| coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4' | ||
|
|
||
| /** NewPipe libraries **/ | ||
| // You can use a local version by uncommenting a few lines in settings.gradle | ||
| // Or you can use a commit you pushed to GitHub by just replacing TeamNewPipe with your GitHub | ||
| // name and the commit hash with the commit hash of the (pushed) commit you want to test | ||
| // This works thanks to JitPack: https://jitpack.io/ | ||
| implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751' | ||
| implementation 'com.github.TeamNewPipe:NewPipeExtractor:289db1178ab66694c23893e6a487d4708343c4' | ||
| implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.23.1' | ||
| implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0' | ||
|
|
||
| /** Checkstyle **/ | ||
|
|
@@ -208,42 +209,39 @@ dependencies { | |
| implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" | ||
|
|
||
| /** AndroidX **/ | ||
| implementation 'androidx.appcompat:appcompat:1.5.1' | ||
| implementation 'androidx.appcompat:appcompat:1.6.1' | ||
| implementation 'androidx.cardview:cardview:1.0.0' | ||
| implementation 'androidx.constraintlayout:constraintlayout:2.1.4' | ||
| implementation 'androidx.core:core-ktx:1.10.0' | ||
| implementation 'androidx.core:core-ktx:1.12.0' | ||
| implementation 'androidx.documentfile:documentfile:1.0.1' | ||
| implementation 'androidx.fragment:fragment-ktx:1.4.1' | ||
| implementation 'androidx.fragment:fragment-ktx:1.6.2' | ||
| implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}" | ||
| implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}" | ||
| implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' | ||
| implementation 'androidx.media:media:1.6.0' | ||
| implementation 'androidx.preference:preference:1.2.0' | ||
| implementation 'androidx.recyclerview:recyclerview:1.2.1' | ||
| implementation 'androidx.media:media:1.7.0' | ||
| implementation 'androidx.preference:preference:1.2.1' | ||
| implementation 'androidx.recyclerview:recyclerview:1.3.2' | ||
| implementation "androidx.room:room-runtime:${androidxRoomVersion}" | ||
| implementation "androidx.room:room-rxjava3:${androidxRoomVersion}" | ||
| kapt "androidx.room:room-compiler:${androidxRoomVersion}" | ||
| implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' | ||
| // Newer version specified to prevent accessibility regressions with RecyclerView, see: | ||
| // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01 | ||
| implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' | ||
| implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02' | ||
| implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}" | ||
| implementation "androidx.work:work-rxjava3:${androidxWorkVersion}" | ||
| implementation 'com.google.android.material:material:1.9.0' | ||
| implementation 'com.google.android.material:material:1.11.0' | ||
|
|
||
| /** Third-party libraries **/ | ||
| // Instance state boilerplate elimination | ||
| implementation "frankiesardo:icepick:${icepickVersion}" | ||
| kapt "frankiesardo:icepick-processor:${icepickVersion}" | ||
|
|
||
| // HTML parser | ||
| implementation "org.jsoup:jsoup:1.16.1" | ||
| implementation "org.jsoup:jsoup:1.17.2" | ||
|
|
||
| // HTTP client | ||
| implementation "com.squareup.okhttp3:okhttp:4.11.0" | ||
| // okhttp3:4.11.0 introduces a vulnerability from com.squareup.okio:[email protected], | ||
| // remove com.squareup.okio:okio when updating okhttp | ||
| implementation "com.squareup.okio:okio:3.4.0" | ||
| implementation "com.squareup.okhttp3:okhttp:4.12.0" | ||
|
|
||
| // Media player | ||
| implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}" | ||
|
|
@@ -272,19 +270,19 @@ dependencies { | |
| implementation "io.noties.markwon:linkify:${markwonVersion}" | ||
|
|
||
| // Crash reporting | ||
| implementation "ch.acra:acra-core:5.10.1" | ||
| implementation "ch.acra:acra-core:5.11.3" | ||
|
|
||
| // Properly restarting | ||
| implementation 'com.jakewharton:process-phoenix:2.1.2' | ||
|
|
||
| // Reactive extensions for Java VM | ||
| implementation "io.reactivex.rxjava3:rxjava:3.1.6" | ||
| implementation "io.reactivex.rxjava3:rxjava:3.1.8" | ||
| implementation "io.reactivex.rxjava3:rxandroid:3.0.2" | ||
| // RxJava binding APIs for Android UI widgets | ||
| implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0" | ||
|
|
||
| // Date and time formatting | ||
| implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final" | ||
| implementation "org.ocpsoft.prettytime:prettytime:5.0.7.Final" | ||
|
|
||
| /** Debugging **/ | ||
| // Memory leak detection | ||
|
|
@@ -297,13 +295,12 @@ dependencies { | |
|
|
||
| /** Testing **/ | ||
| testImplementation 'junit:junit:4.13.2' | ||
| testImplementation "org.mockito:mockito-core:${mockitoVersion}" | ||
| testImplementation "org.mockito:mockito-inline:${mockitoVersion}" | ||
| testImplementation 'org.mockito:mockito-core:5.6.0' | ||
|
|
||
| androidTestImplementation "androidx.test.ext:junit:1.1.5" | ||
| androidTestImplementation "androidx.test:runner:1.5.2" | ||
| androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}" | ||
| androidTestImplementation "org.assertj:assertj-core:3.23.1" | ||
| androidTestImplementation "org.assertj:assertj-core:3.24.2" | ||
| } | ||
|
|
||
| static String getGitWorkingBranch() { | ||
|
|
||
Oops, something went wrong.