diff --git a/app-mvp/build.gradle b/app-mvp/build.gradle index 01e8cd9..62fe739 100644 --- a/app-mvp/build.gradle +++ b/app-mvp/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.androidCompileSdkVersion - buildToolsVersion rootProject.ext.androidBuildToolsVersion defaultConfig { applicationId "uk.ivanc.archimvp" @@ -22,17 +21,17 @@ android { dependencies { Map dependencies = rootProject.ext.dependencies; - compile dependencies.appCompat - compile dependencies.cardView - compile dependencies.recyclerView - compile dependencies.retrofit - compile dependencies.retrofitConverterGson - compile dependencies.retrofitAdapterRxJava - compile dependencies.picasso - compile dependencies.rxAndroid - compile dependencies.circleImageView + implementation dependencies.appCompat + implementation dependencies.cardView + implementation dependencies.recyclerView + implementation dependencies.retrofit + implementation dependencies.retrofitConverterGson + implementation dependencies.retrofitAdapterRxJava + implementation dependencies.picasso + implementation dependencies.rxAndroid + implementation dependencies.circleImageView - testCompile dependencies.jUnit - testCompile dependencies.mockito - testCompile dependencies.robolectric + implementation dependencies.jUnit + implementation dependencies.mockito + implementation dependencies.robolectric } \ No newline at end of file diff --git a/app-mvvm/build.gradle b/app-mvvm/build.gradle index 4bdbfc7..cda4a64 100644 --- a/app-mvvm/build.gradle +++ b/app-mvvm/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.androidCompileSdkVersion - buildToolsVersion rootProject.ext.androidBuildToolsVersion defaultConfig { applicationId "uk.ivanc.archimvvm" @@ -27,17 +26,17 @@ android { dependencies { Map dependencies = rootProject.ext.dependencies; - compile dependencies.appCompat - compile dependencies.cardView - compile dependencies.recyclerView - compile dependencies.retrofit - compile dependencies.retrofitConverterGson - compile dependencies.retrofitAdapterRxJava - compile dependencies.picasso - compile dependencies.rxAndroid - compile dependencies.circleImageView + implementation dependencies.appCompat + implementation dependencies.cardView + implementation dependencies.recyclerView + implementation dependencies.retrofit + implementation dependencies.retrofitConverterGson + implementation dependencies.retrofitAdapterRxJava + implementation dependencies.picasso + implementation dependencies.rxAndroid + implementation dependencies.circleImageView - testCompile dependencies.jUnit - testCompile dependencies.mockito - testCompile dependencies.robolectric + implementation dependencies.jUnit + implementation dependencies.mockito + implementation dependencies.robolectric } diff --git a/app/build.gradle b/app/build.gradle index 274c20e..2584d5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.androidCompileSdkVersion - buildToolsVersion rootProject.ext.androidBuildToolsVersion defaultConfig { applicationId "uk.ivanc.archi" @@ -22,13 +21,13 @@ android { dependencies { Map dependencies = rootProject.ext.dependencies; - compile dependencies.appCompat - compile dependencies.cardView - compile dependencies.recyclerView - compile dependencies.retrofit - compile dependencies.retrofitConverterGson - compile dependencies.retrofitAdapterRxJava - compile dependencies.picasso - compile dependencies.rxAndroid - compile dependencies.circleImageView + implementation dependencies.appCompat + implementation dependencies.cardView + implementation dependencies.recyclerView + implementation dependencies.retrofit + implementation dependencies.retrofitConverterGson + implementation dependencies.retrofitAdapterRxJava + implementation dependencies.picasso + implementation dependencies.rxAndroid + implementation dependencies.circleImageView } diff --git a/build.gradle b/build.gradle index 29dd2c2..93bb1ad 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,17 @@ apply from: 'dependencies.gradle' buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.5.1' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 378ad43..223a110 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 08 10:20:43 GMT 2017 +#Thu Oct 03 16:49:46 PKT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip