From 9598a7967b6618849f49fe9f45c193e147524067 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Sun, 29 Apr 2018 18:26:48 +0200 Subject: [PATCH] Update Checkout Gradle configuration --- app/build.gradle | 11 +++++------ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- lib/build.gradle | 11 +++++------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 770933d..676e58e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,13 +46,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "com.android.support:support-v4:${versions.libs.support}" - compile "com.android.support:appcompat-v7:${versions.libs.support}" - compile "com.android.support:recyclerview-v7:${versions.libs.support}" - compile 'com.jakewharton:butterknife:8.4.0' + implementation "com.android.support:support-v4:${versions.libs.support}" + implementation "com.android.support:appcompat-v7:${versions.libs.support}" + implementation "com.android.support:recyclerview-v7:${versions.libs.support}" + implementation 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' - compile project(':lib') + implementation project(':lib') } task androidSourcesJar(type: Jar) { diff --git a/build.gradle b/build.gradle index 21505f1..9044c83 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' } ext { versions = [libs: [support: "27.0.2"], diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9332791..d682c6d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 26 20:20:11 CET 2018 +#Sun Apr 29 18:17:38 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/lib/build.gradle b/lib/build.gradle index 29b32ad..e8f3ce0 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -40,13 +40,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.code.findbugs:jsr305:2.0.3' + api 'com.google.code.findbugs:jsr305:2.0.3' - testCompile 'junit:junit:4.12' - testCompile 'org.robolectric:robolectric:3.0' - testCompile "org.mockito:mockito-all:1.9.5" - testCompile "org.skyscreamer:jsonassert:1.2.3" + testImplementation 'junit:junit:4.12' + testImplementation 'org.robolectric:robolectric:3.0' + testImplementation "org.mockito:mockito-all:1.9.5" + testImplementation "org.skyscreamer:jsonassert:1.2.3" } tasks.withType(Test) {