From ffae2eda8394cc8f010537b1aab68090657dec31 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Tue, 9 Oct 2018 12:22:30 -0400 Subject: [PATCH 1/2] simply update gradles to 28, and some dependencies --- .travis.yml | 6 ++--- app/build.gradle | 70 +++++++++++++++++++++++------------------------- build.gradle | 6 ++--- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5d3aed9c..d6f97ab55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,13 @@ android: components: # The BuildTools version used by NewPipe - tools - - build-tools-27.0.3 + - build-tools-28.0.3 # The SDK version used to compile NewPipe - - android-27 + - android-28 before_install: - - yes | sdkmanager "platforms;android-27" + - yes | sdkmanager "platforms;android-28" script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest licenses: diff --git a/app/build.gradle b/app/build.gradle index 4ae9f0fb7..0b3d79adb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "org.schabi.newpipe" minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 68 versionName "0.14.1" @@ -22,7 +22,6 @@ android { } debug { multiDexEnabled true - debuggable true applicationIdSuffix ".debug" } @@ -41,62 +40,61 @@ android { } ext { - supportLibVersion = '27.1.1' - exoPlayerLibVersion = '2.8.2' + supportLibVersion = '28.0.0' + exoPlayerLibVersion = '2.8.4' //2.9.0 roomDbLibVersion = '1.1.1' - leakCanaryLibVersion = '1.5.4' - okHttpLibVersion = '3.10.0' + leakCanaryLibVersion = '1.5.4' //1.6.1 + okHttpLibVersion = '3.11.0' icepickLibVersion = '3.2.0' stethoLibVersion = '1.5.0' } dependencies { - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') { + androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', { exclude module: 'support-annotations' - } + }) - implementation 'com.github.TeamNewPipe:NewPipeExtractor:217d13b1028' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:24cb684e235' testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.8.9' + testImplementation 'org.mockito:mockito-core:2.23.0' - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support:support-v4:$supportLibVersion" - implementation "com.android.support:design:$supportLibVersion" - implementation "com.android.support:recyclerview-v7:$supportLibVersion" - implementation "com.android.support:preference-v14:$supportLibVersion" + implementation "com.android.support:appcompat-v7:${supportLibVersion}" + implementation "com.android.support:support-v4:${supportLibVersion}" + implementation "com.android.support:design:${supportLibVersion}" + implementation "com.android.support:recyclerview-v7:${supportLibVersion}" + implementation "com.android.support:preference-v14:${supportLibVersion}" + implementation "com.android.support:cardview-v7:${supportLibVersion}" + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'ch.acra:acra:4.9.2' + implementation 'ch.acra:acra:4.9.2' //4.11 implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1' implementation 'com.nononsenseapps:filepicker:4.2.1' - implementation "com.google.android.exoplayer:exoplayer:$exoPlayerLibVersion" - implementation "com.google.android.exoplayer:extension-mediasession:$exoPlayerLibVersion" + implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}" + implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}" - debugImplementation "com.facebook.stetho:stetho:$stethoLibVersion" - debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion" + debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}" + debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}" debugImplementation 'com.android.support:multidex:1.0.3' - implementation 'io.reactivex.rxjava2:rxjava:2.1.14' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' + 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 "android.arch.persistence.room:runtime:$roomDbLibVersion" - implementation "android.arch.persistence.room:rxjava2:$roomDbLibVersion" - annotationProcessor "android.arch.persistence.room:compiler:$roomDbLibVersion" + implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}" + implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}" + annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}" - implementation "frankiesardo:icepick:$icepickLibVersion" - annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion" + implementation "frankiesardo:icepick:${icepickLibVersion}" + annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}" - debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion" - releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion" + debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}" + releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}" - - implementation "com.squareup.okhttp3:okhttp:$okHttpLibVersion" - debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoLibVersion" - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - implementation 'com.android.support:cardview-v7:27.1.1' + implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}" + debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}" } diff --git a/build.gradle b/build.gradle index 20c8a0dfc..a95f6dcc0 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,8 +16,8 @@ buildscript { allprojects { repositories { jcenter() - maven { url 'https://jitpack.io' } google() - maven { url 'https://clojars.org/repo' } + maven { url "https://jitpack.io" } + maven { url "https://clojars.org/repo" } } } From d3fcb0aa6a9facc05ade3bc73d39dba41c5ddc08 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 10 Oct 2018 14:29:26 -0400 Subject: [PATCH 2/2] Update build.gradle --- app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0b3d79adb..83e8f8a0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,8 @@ dependencies { exclude module: 'support-annotations' }) - implementation 'com.github.TeamNewPipe:NewPipeExtractor:24cb684e235' + //https://github.com/TeamNewPipe/NewPipeExtractor/commits/master + implementation 'com.github.TeamNewPipe:NewPipeExtractor:96b4c97cee1' //24cb684e235 testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.23.0'