diff --git a/build.gradle b/build.gradle index b19de89..7610ac8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8a38705..c8b2d97 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 13 18:00:07 CET 2018 +#Tue Mar 12 15:03:52 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 4f82e77..d5d4217 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -25,21 +25,22 @@ android { dependencies { // tests - testCompile "junit:junit:${JUNIT_VERSION}" - testCompile "org.mockito:mockito-core:${ MOCKITO_VERSION}" - testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" + testImplementation "junit:junit:${JUNIT_VERSION}" + testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}" + testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - compile "android.arch.lifecycle:extensions:${ANDROID_ARCH_LIFECYCLE_VERSION}" + implementation "android.arch.lifecycle:extensions:${ANDROID_ARCH_LIFECYCLE_VERSION}" annotationProcessor "android.arch.lifecycle:compiler:${ANDROID_ARCH_LIFECYCLE_VERSION}" // dependencies - compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}" + implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}" + implementation "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}" - compile ("com.skocken:efficientadapter:2.3.1") { + implementation("com.skocken:efficientadapter:2.3.1") { exclude group: 'com.android.support' // don't check the Android support version, use ours } // the recycler view require for efficient adapter as it has been exclude - compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}" + implementation "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}" } apply from: '../gradle_script/installv1.gradle' diff --git a/sample/build.gradle b/sample/build.gradle index b373719..d51bab8 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -19,8 +19,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:${JUNIT_VERSION}" - compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}" - compile project(':presentation') + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:${JUNIT_VERSION}" + implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}" + implementation project(':presentation') }