Upgrade some dependencies

.travis.yml

@@ -5,13 +5,13 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-28.0.3
+    - build-tools-29.0.3
 
     # The SDK version used to compile NewPipe
-    - android-28
+    - android-29
 
 before_install: 
-  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-29"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:

app/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'checkstyle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 930
         versionName "0.19.3"
 
@@ -80,22 +80,22 @@ android {
 }
 
 ext {
-    androidxLibVersion = '1.1.0'
-    exoPlayerLibVersion = '2.11.4'
-    roomDbLibVersion = '2.1.0'
-    leakCanaryLibVersion = '1.5.4' //1.6.1
-    okHttpLibVersion = '3.12.6'
-    icepickLibVersion = '3.2.0'
-    stethoLibVersion = '1.5.0'
-    markwonVersion = '4.2.1'
-    checkstyleVersion = '8.31'
+    icepickVersion = '3.2.0'
+    checkstyleVersion = '8.32'
+    stethoVersion = '1.5.1'
+    leakCanaryVersion = '2.2'
+    exoPlayerVersion = '2.11.4'
+    androidxLifecycleVersion = '2.2.0'
+    androidxRoomVersion = '2.2.5'
+    groupieVersion = '2.8.0'
+    markwonVersion = '4.3.1'
 }
 
 checkstyle {
     configFile rootProject.file('checkstyle.xml')
     ignoreFailures false
     showViolations true
-    toolVersion = "${checkstyleVersion}"
+    toolVersion = checkstyleVersion
 }
 
 task runCheckstyle(type: Checkstyle) {
@@ -140,70 +140,73 @@ afterEvaluate {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    implementation "frankiesardo:icepick:${icepickVersion}"
+    kapt "frankiesardo:icepick-processor:${icepickVersion}"
+
     debugImplementation "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
     ktlint "com.pinterest:ktlint:0.35.0"
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
-        exclude module: 'support-annotations'
-    })
+    debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:f3913e241e379adf0091319091e8f895c5fcfd07'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.23.0'
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
+    implementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"
 
-    implementation "androidx.appcompat:appcompat:${androidxLibVersion}"
-    implementation "com.google.android.material:material:${androidxLibVersion}"
-    implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}"
-    implementation "androidx.preference:preference:${androidxLibVersion}"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    debugImplementation "androidx.multidex:multidex:2.0.1"
 
-    implementation 'com.xwray:groupie:2.7.0'
-    implementation 'com.xwray:groupie-kotlin-android-extensions:2.7.0'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.mockito:mockito-core:3.3.3'
 
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0", {
+        exclude module: 'support-annotations'
+    }
 
-    // Originally in NewPipeExtractor
-    implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'org.jsoup:jsoup:1.9.2'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:0b4977bb0c7c9928cd8904951cfe94c71b4e81de'
 
-    implementation 'ch.acra:acra:4.9.2' //4.11
+    implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
+    implementation "org.jsoup:jsoup:1.13.1"
 
-    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
-    implementation 'com.nononsenseapps:filepicker:4.2.1'
+    implementation "com.squareup.okhttp3:okhttp:3.12.11"
 
-    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
-    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
+    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
-    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
-    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
-    debugImplementation 'androidx.multidex:multidex:2.0.1'
+    implementation "com.google.android.material:material:1.1.0"
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.3.Final'
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
 
-    implementation "androidx.room:room-runtime:${roomDbLibVersion}"
-    implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"
-    kapt "androidx.room:room-compiler:${roomDbLibVersion}"
+    implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-extensions:${androidxLifecycleVersion}"
 
-    implementation "frankiesardo:icepick:${icepickLibVersion}"
-    kapt "frankiesardo:icepick-processor:${icepickLibVersion}"
+    implementation "androidx.room:room-runtime:${androidxRoomVersion}"
+    implementation "androidx.room:room-rxjava2:${androidxRoomVersion}"
+    kapt "androidx.room:room-compiler:${androidxRoomVersion}"
 
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
+    implementation "com.xwray:groupie:${groupieVersion}"
+    implementation "com.xwray:groupie-kotlin-android-extensions:${groupieVersion}"
 
-    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
+    implementation "de.hdodenhof:circleimageview:3.1.0"
+    implementation "com.nostra13.universalimageloader:universal-image-loader:1.9.5"
 
     implementation "io.noties.markwon:core:${markwonVersion}"
     implementation "io.noties.markwon:linkify:${markwonVersion}"
+
+    implementation "com.nononsenseapps:filepicker:4.2.1"
+
+    implementation "ch.acra:acra-core:5.5.0"
+
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
+
+    implementation "org.ocpsoft.prettytime:prettytime:4.0.5.Final"
 }
 
 static String getGitWorkingBranch() {

app/src/debug/java/org/schabi/newpipe/DebugApp.kt

@@ -0,0 +1,59 @@
+package org.schabi.newpipe
+
+import android.content.Context
+import androidx.multidex.MultiDex
+import androidx.preference.PreferenceManager
+import com.facebook.stetho.Stetho
+import com.facebook.stetho.okhttp3.StethoInterceptor
+import leakcanary.AppWatcher
+import leakcanary.LeakCanary
+import okhttp3.OkHttpClient
+import org.schabi.newpipe.extractor.downloader.Downloader
+
+class DebugApp : App() {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+        MultiDex.install(this)
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        initStetho()
+
+        // Give each object 10 seconds to be GC'ed, before LeakCanary gets nosy on it
+        AppWatcher.config = AppWatcher.config.copy(watchDurationMillis = 10000)
+        LeakCanary.config = LeakCanary.config.copy(dumpHeap = PreferenceManager
+                .getDefaultSharedPreferences(this).getBoolean(getString(
+                        R.string.allow_heap_dumping_key), false))
+    }
+
+    override fun getDownloader(): Downloader {
+        val downloader = DownloaderImpl.init(OkHttpClient.Builder()
+                .addNetworkInterceptor(StethoInterceptor()))
+        setCookiesToDownloader(downloader)
+        return downloader
+    }
+
+    private fun initStetho() {
+        // Create an InitializerBuilder
+        val initializerBuilder = Stetho.newInitializerBuilder(this)
+
+        // Enable Chrome DevTools
+        initializerBuilder.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
+
+        // Enable command line interface
+        initializerBuilder.enableDumpapp(
+                Stetho.defaultDumperPluginsProvider(applicationContext))
+
+        // Use the InitializerBuilder to generate an Initializer
+        val initializer = initializerBuilder.build()
+
+        // Initialize Stetho with the Initializer
+        Stetho.initialize(initializer)
+    }
+
+    override fun isDisposedRxExceptionsReported(): Boolean {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(getString(R.string.allow_disposed_exceptions_key), false)
+    }
+}