Skip to content

Commit 6e8c9f9

Browse files
committed
Merge branch 'dev' into pr2335
2 parents 3d9d25d + 8c5e8bd commit 6e8c9f9

423 files changed

Lines changed: 3411 additions & 4299 deletions

File tree

Some content is hidden

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

LICENSE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU GENERAL PUBLIC LICENSE
22
Version 3, 29 June 2007
33

4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
55
Everyone is permitted to copy and distribute verbatim copies
66
of this license document, but changing it is not allowed.
77

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
645645
GNU General Public License for more details.
646646

647647
You should have received a copy of the GNU General Public License
648-
along with this program. If not, see <http://www.gnu.org/licenses/>.
648+
along with this program. If not, see <https://www.gnu.org/licenses/>.
649649

650650
Also add information on how to contact you by electronic and paper mail.
651651

@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
664664
You should also get your employer (if you work as a programmer) or school,
665665
if any, to sign a "copyright disclaimer" for the program, if necessary.
666666
For more information on this, and how to apply and follow the GNU GPL, see
667-
<http://www.gnu.org/licenses/>.
667+
<https://www.gnu.org/licenses/>.
668668

669669
The GNU General Public License does not permit incorporating your program
670670
into proprietary programs. If your program is a subroutine library, you
671671
may consider it more useful to permit linking proprietary applications with
672672
the library. If this is what you want to do, use the GNU Lesser General
673673
Public License instead of this License. But first, please read
674-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
674+
<https://www.gnu.org/licenses/why-not-lgpl.html>.

app/build.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ plugins {
99

1010
android {
1111
compileSdk 31
12-
buildToolsVersion '30.0.3'
12+
buildToolsVersion '31.0.0'
1313

1414
defaultConfig {
1515
applicationId "org.schabi.newpipe"
1616
resValue "string", "app_name", "NewPipe"
1717
minSdk 19
1818
targetSdk 29
19-
versionCode 983
20-
versionName "0.22.0"
19+
versionCode 984
20+
versionName "0.22.1"
2121

2222
multiDexEnabled true
2323

@@ -98,10 +98,10 @@ android {
9898
}
9999

100100
ext {
101-
checkstyleVersion = '9.2.1'
101+
checkstyleVersion = '10.0'
102102

103103
androidxLifecycleVersion = '2.3.1'
104-
androidxRoomVersion = '2.3.0'
104+
androidxRoomVersion = '2.4.2'
105105
androidxWorkVersion = '2.7.1'
106106

107107
icepickVersion = '3.2.0'
@@ -122,7 +122,7 @@ configurations {
122122
}
123123

124124
checkstyle {
125-
getConfigDirectory().set(rootProject.file("."))
125+
getConfigDirectory().set(rootProject.file("checkstyle"))
126126
ignoreFailures false
127127
showViolations true
128128
toolVersion = checkstyleVersion
@@ -194,24 +194,24 @@ dependencies {
194194

195195
/** Checkstyle **/
196196
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
197-
ktlint 'com.pinterest:ktlint:0.43.2'
197+
ktlint 'com.pinterest:ktlint:0.44.0'
198198

199199
/** Kotlin **/
200200
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
201201

202202
/** AndroidX **/
203203
implementation 'androidx.appcompat:appcompat:1.3.1'
204204
implementation 'androidx.cardview:cardview:1.0.0'
205-
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
205+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
206206
implementation 'androidx.core:core-ktx:1.6.0'
207207
implementation 'androidx.documentfile:documentfile:1.0.1'
208208
implementation 'androidx.fragment:fragment-ktx:1.3.6'
209209
implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
210210
implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
211-
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
212-
implementation 'androidx.media:media:1.4.3'
211+
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
212+
implementation 'androidx.media:media:1.5.0'
213213
implementation 'androidx.multidex:multidex:2.0.1'
214-
implementation 'androidx.preference:preference:1.1.1'
214+
implementation 'androidx.preference:preference:1.2.0'
215215
implementation 'androidx.recyclerview:recyclerview:1.2.1'
216216
implementation "androidx.room:room-runtime:${androidxRoomVersion}"
217217
implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
@@ -221,7 +221,8 @@ dependencies {
221221
// https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
222222
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
223223
implementation 'androidx.webkit:webkit:1.4.0'
224-
implementation 'com.google.android.material:material:1.4.0'
224+
implementation 'com.google.android.material:material:1.5.0'
225+
implementation "androidx.work:work-runtime:${androidxWorkVersion}"
225226
implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}"
226227
implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
227228

@@ -249,8 +250,6 @@ dependencies {
249250
implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
250251
implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
251252

252-
// Circular ImageView
253-
implementation "de.hdodenhof:circleimageview:3.1.0"
254253
// Image loading
255254
//noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
256255
implementation "com.squareup.picasso:picasso:2.8"

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,6 @@
381381
<service
382382
android:name=".RouterActivity$FetcherService"
383383
android:exported="false" />
384-
<service
385-
android:name=".CheckForNewAppVersion"
386-
android:exported="false" />
387384

388385
<!-- opting out of sending metrics to Google in Android System WebView -->
389386
<meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />

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

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

0 commit comments

Comments
 (0)