Skip to content

Commit b22e17e

Browse files
Merge branch 'dev' of https://github.com/volatilespecial/NewPipe into work/fix/13057
2 parents fcec04f + 0cdf40c commit b22e17e

File tree

272 files changed

+3354
-3540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+3354
-3540
lines changed

app/build.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import com.android.build.api.dsl.ApplicationExtension
77

88
plugins {
99
alias(libs.plugins.android.application)
10-
alias(libs.plugins.android.legacy.kapt)
10+
alias(libs.plugins.jetbrains.kotlin.android)
11+
alias(libs.plugins.jetbrains.kotlin.kapt)
1112
alias(libs.plugins.google.ksp)
1213
alias(libs.plugins.jetbrains.kotlin.parcelize)
1314
alias(libs.plugins.sonarqube)
@@ -43,9 +44,9 @@ configure<ApplicationExtension> {
4344
minSdk = 21
4445
targetSdk = 35
4546

46-
versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1007
47+
versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1008
4748

48-
versionName = "0.28.2"
49+
versionName = "0.28.3"
4950
System.getProperty("versionNameSuffix")?.let { versionNameSuffix = it }
5051

5152
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -78,7 +79,7 @@ configure<ApplicationExtension> {
7879
resValue("string", "app_name", "NewPipe $suffix")
7980
}
8081
isMinifyEnabled = true
81-
isShrinkResources = false // disabled to fix F-Droid"s reproducible build
82+
isShrinkResources = true
8283
proguardFiles(
8384
getDefaultProguardFile("proguard-android-optimize.txt"),
8485
"proguard-rules.pro"
@@ -87,13 +88,9 @@ configure<ApplicationExtension> {
8788
}
8889

8990
lint {
90-
checkReleaseBuilds = false
91-
// Or, if you prefer, you can continue to check for errors in release builds,
92-
// but continue the build even when errors are found:
91+
lintConfig = file("lint.xml")
92+
// Continue the debug build even when errors are found
9393
abortOnError = false
94-
// suppress false warning ("Resource IDs will be non-final in Android Gradle Plugin version
95-
// 5.0, avoid using them in switch case statements"), which affects only library projects
96-
disable += "NonConstantResourceId"
9794
}
9895

9996
compileOptions {
@@ -275,7 +272,8 @@ dependencies {
275272
implementation(libs.lisawray.groupie.viewbinding)
276273

277274
// Image loading
278-
implementation(libs.squareup.picasso)
275+
implementation(libs.coil.compose)
276+
implementation(libs.coil.network.okhttp)
279277

280278
// Markdown library for Android
281279
implementation(libs.noties.markwon.core)

app/lint.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ SPDX-FileCopyrightText: 2026 NewPipe e.V. <https://newpipe-ev.de>
4+
~ SPDX-License-Identifier: GPL-3.0-or-later
5+
-->
6+
<lint>
7+
<issue id="MissingTranslation" severity="ignore" />
8+
<issue id="MissingQuantity" severity="ignore" />
9+
<issue id="ImpliedQuantity" severity="ignore" />
10+
</lint>

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,8 @@
3939

4040
## For some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml)
4141
-keep class org.schabi.newpipe.settings.notifications.** { *; }
42+
43+
# Prevent R8 from stripping or renaming Protobuf internal fields
44+
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
45+
<fields>;
46+
}

app/src/main/java/org/schabi/newpipe/App.java

Lines changed: 0 additions & 285 deletions
This file was deleted.

0 commit comments

Comments
 (0)