From 2e5444ceae94250ad2d7397315ff6930d207fb35 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 10 Aug 2017 15:28:20 +0200 Subject: [PATCH 1/4] bumb support lib to 25.4.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 46b733efcf07..e5fa131907da 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ configurations.all { } ext { - supportLibraryVersion = '25.2.0' + supportLibraryVersion = '25.4.0' googleLibraryVersion = '10.2.4' travisBuild = System.getenv("TRAVIS") == "true" From 29f8b83df8539e53b03698c995f68fa2777d1f0d Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 10 Aug 2017 15:41:53 +0200 Subject: [PATCH 2/4] upgrade to gradle:3.0.0-beta1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e5fa131907da..72a3f2d0a6c3 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha9' + classpath 'com.android.tools.build:gradle:3.0.0-beta1' classpath 'com.google.gms:google-services:3.0.0' } } From e30c6ba5ecfc8ca692b066e77dcb8450768972fa Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 10 Aug 2017 15:56:43 +0200 Subject: [PATCH 3/4] update test lib versions --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 72a3f2d0a6c3..fded70b02f9a 100644 --- a/build.gradle +++ b/build.gradle @@ -212,13 +212,13 @@ dependencies { testImplementation 'org.mockito:mockito-core:1.10.19' /// dependencies for instrumented tests // JUnit4 Rules - androidTestImplementation 'com.android.support.test:rules:0.5' + androidTestImplementation 'com.android.support.test:rules:1.0.0' // Android JUnit Runner - androidTestImplementation 'com.android.support.test:runner:0.5' + androidTestImplementation 'com.android.support.test:runner:1.0.0' // Android Annotation Support androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}" // Espresso core - androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.0' // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests //androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details From 7d823beed5743f4e2b37b57ee800fdb14bb0fc6a Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 10 Aug 2017 18:02:24 +0200 Subject: [PATCH 4/4] android-library:1.0.24 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fded70b02f9a..8e7d26bcf47b 100644 --- a/build.gradle +++ b/build.gradle @@ -184,7 +184,7 @@ dependencies { /// dependencies for app building implementation name: 'touch-image-view' implementation 'com.android.support:multidex:1.0.2' - implementation 'com.github.nextcloud:android-library:1.0.23' + implementation 'com.github.nextcloud:android-library:1.0.24' implementation "com.android.support:support-v4:${supportLibraryVersion}" implementation "com.android.support:design:${supportLibraryVersion}" implementation 'com.jakewharton:disklrucache:2.0.2'