From 10559bb8940628033c21a3d9820902d5b20b2c31 Mon Sep 17 00:00:00 2001 From: Amine Date: Sat, 2 Sep 2017 12:51:11 +0200 Subject: [PATCH] Fixed build problem from last commit. --- app/build.gradle | 16 +++++++++------- app/src/main/AndroidManifest.xml | 4 +--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0c74a0..3c6490e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,12 +83,12 @@ android { dependencies { // Testing - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' - androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0' + androidTestCompile 'com.android.support.test:runner:1.0.0' // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource - androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2' + androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.0' // Espresso-intents for validation and stubbing of Intents - androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2' + androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.0' compile fileTree(dir: 'libs', include: ['*.jar']) @@ -119,7 +119,7 @@ dependencies { compile 'agency.tango.android:material-intro-screen:0.0.5' // About - compile('com.mikepenz:aboutlibraries:5.9.6@aar') { + compile('com.mikepenz:aboutlibraries:5.9.7@aar') { transitive = true } @@ -137,8 +137,10 @@ dependencies { compile 'org.sufficientlysecure:html-textview:3.3' // glide - compile 'com.github.bumptech.glide:glide:4.1.0' - compile 'com.github.bumptech.glide:okhttp3-integration:4.0.0' + compile('com.github.bumptech.glide:glide:4.1.0@aar') { + transitive = true; + } + compile('com.github.bumptech.glide:okhttp3-integration:4.1.0@aar') // Asking politely users to rate the app compile 'com.github.stkent:amplify:1.5.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9ecc30d..a144fec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -64,9 +64,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 81a2259..4d0c38f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ buildscript { ext.kotlin_version = '1.1.4-3' repositories { - maven { url 'https://maven.google.com' } jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.0-beta4' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e94ac2b..242eea6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sat Sep 02 07:47:16 CEST 2017 +#Sat Sep 02 11:43:17 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME