From 5d6320d925b024258be6055d14a9cf0b3f212de3 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 10 Nov 2017 10:33:59 +0100 Subject: [PATCH 1/4] Upgrade to Studio 3 --- app/build.gradle | 64 +++++++++++++----------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f7af72968..187bb5326 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' + compileSdkVersion 27 + buildToolsVersion '27.0.1' defaultConfig { applicationId "org.schabi.newpipe" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 41 versionName "0.11.0" @@ -27,6 +27,10 @@ android { applicationIdSuffix ".debug" } beta { + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + applicationIdSuffix ".beta" } } @@ -44,42 +48,42 @@ android { } dependencies { - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') { + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') { exclude module: 'support-annotations' } - compile 'com.github.TeamNewPipe:NewPipeExtractor:b9d0941' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:b9d0941411' - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:1.10.19' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:1.10.19' - compile 'com.android.support:appcompat-v7:26.0.1' - compile 'com.android.support:support-v4:26.0.1' - compile 'com.android.support:design:26.0.1' - compile 'com.android.support:recyclerview-v7:26.0.1' - compile 'com.android.support:preference-v14:26.0.1' + implementation 'com.android.support:appcompat-v7:27.0.0' + implementation 'com.android.support:support-v4:27.0.0' + implementation 'com.android.support:design:27.0.0' + implementation 'com.android.support:recyclerview-v7:27.0.0' + implementation 'com.android.support:preference-v14:27.0.0' - compile 'com.google.code.gson:gson:2.7' - compile 'ch.acra:acra:4.9.0' + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'ch.acra:acra:4.9.0' - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' - compile 'de.hdodenhof:circleimageview:2.1.0' - compile 'com.github.nirhart:parallaxscroll:1.0' - compile 'com.nononsenseapps:filepicker:3.0.1' - compile 'com.google.android.exoplayer:exoplayer:r2.5.4' + 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:3.0.1' + implementation 'com.google.android.exoplayer:exoplayer:r2.5.4' - debugCompile 'com.facebook.stetho:stetho:1.5.0' - debugCompile 'com.facebook.stetho:stetho-urlconnection:1.5.0' - debugCompile 'com.android.support:multidex:1.0.1' + debugImplementation 'com.facebook.stetho:stetho:1.5.0' + debugImplementation 'com.facebook.stetho:stetho-urlconnection:1.5.0' + debugImplementation 'com.android.support:multidex:1.0.2' - compile 'io.reactivex.rxjava2:rxjava:2.1.2' - compile 'io.reactivex.rxjava2:rxandroid:2.0.1' - compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0' + implementation 'io.reactivex.rxjava2:rxjava:2.1.6' + implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' + implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0' - compile 'android.arch.persistence.room:runtime:1.0.0-alpha8' - compile 'android.arch.persistence.room:rxjava2:1.0.0-alpha8' - annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-alpha8' + implementation 'android.arch.persistence.room:runtime:1.0.0' + implementation 'android.arch.persistence.room:rxjava2:1.0.0' + annotationProcessor 'android.arch.persistence.room:compiler:1.0.0' - compile 'frankiesardo:icepick:3.2.0' - provided 'frankiesardo:icepick-processor:3.2.0' + implementation 'frankiesardo:icepick:3.2.0' + annotationProcessor 'frankiesardo:icepick-processor:3.2.0' } diff --git a/build.gradle b/build.gradle index 5c494fe59..c0c46fdc2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52dd1f044..4c397c615 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Thu Nov 09 12:44:58 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip From a09c8934fcc249f3cfa964dc8e48706b27b6d133 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 10 Nov 2017 15:34:57 +0100 Subject: [PATCH 2/4] Fix Travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0fcfb82b..fe50d1a63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ android: components: # The BuildTools version used by NewPipe - tools - - build-tools-26.0.1 + - build-tools-27.0.1 # The SDK version used to compile NewPipe - - android-26 + - android-27 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest From ac53eeb76d8f071d950cbbd5f5379bea31a19818 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 10 Nov 2017 15:36:13 +0100 Subject: [PATCH 3/4] Upgrade ACRA --- app/build.gradle | 2 +- app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 187bb5326..69504e2f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation 'com.android.support:preference-v14:27.0.0' implementation 'com.google.code.gson:gson:2.8.2' - implementation 'ch.acra:acra:4.9.0' + implementation 'ch.acra:acra:4.9.2' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'de.hdodenhof:circleimageview:2.2.0' diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java index b62b63510..43e240fbb 100644 --- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java +++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java @@ -160,7 +160,7 @@ public class ErrorActivity extends AppCompatActivity { key = k; } } - String[] el = new String[]{report.get(key)}; + String[] el = new String[]{report.get(key).toString()}; Intent intent = new Intent(context, ErrorActivity.class); intent.putExtra(ERROR_INFO, errorInfo); From cb5cf9bb0934a03c90b4359ac6d493dc1154a897 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Fri, 10 Nov 2017 21:31:19 +0100 Subject: [PATCH 4/4] update support lib to 27.0.1 --- app/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 69504e2f9..c38bf8d4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,11 +57,11 @@ dependencies { testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:1.10.19' - implementation 'com.android.support:appcompat-v7:27.0.0' - implementation 'com.android.support:support-v4:27.0.0' - implementation 'com.android.support:design:27.0.0' - implementation 'com.android.support:recyclerview-v7:27.0.0' - implementation 'com.android.support:preference-v14:27.0.0' + implementation 'com.android.support:appcompat-v7:27.0.1' + implementation 'com.android.support:support-v4:27.0.1' + implementation 'com.android.support:design:27.0.1' + implementation 'com.android.support:recyclerview-v7:27.0.1' + implementation 'com.android.support:preference-v14:27.0.1' implementation 'com.google.code.gson:gson:2.8.2' implementation 'ch.acra:acra:4.9.2'