From c76ffe4db76b84a1de9200b87087da830038aa2f Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 21 Dec 2017 10:12:10 +0100 Subject: [PATCH] Update android plugin to 3.0.1 version. Yay! Signed-off-by: Yahor Berdnikau --- build.gradle | 2 ++ dependencies.gradle | 3 +-- library/build.gradle | 3 +-- menudrawer/build.gradle | 1 - pulltorefresh/build.gradle | 1 - ultrasonic/build.gradle | 25 ++++++++++++------------- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 883b3ebc..0d7e4ed2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { repositories { jcenter() + google() maven { url "https://plugins.gradle.org/m2/" } } dependencies { @@ -23,6 +24,7 @@ allprojects { buildscript { repositories { jcenter() + google() } } diff --git a/dependencies.gradle b/dependencies.gradle index 7be992f3..62cacfd6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,8 +4,7 @@ ext.versions = [ compileSdk : 27, gradle : '4.4.1', - buildTools : "25.0.3", - androidTools : "2.3.3", + androidTools : "3.0.1", ktlint : "0.12.1", ktlintGradle : "2.3.0", detekt : "1.0.0.RC5-4", diff --git a/library/build.gradle b/library/build.gradle index c375cbc8..b2e07832 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { minSdkVersion versions.minSdk @@ -23,5 +22,5 @@ android { } dependencies { - compile androidSupport.support + api androidSupport.support } diff --git a/menudrawer/build.gradle b/menudrawer/build.gradle index cd6f4945..1979d8cd 100644 --- a/menudrawer/build.gradle +++ b/menudrawer/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { minSdkVersion versions.minSdk diff --git a/pulltorefresh/build.gradle b/pulltorefresh/build.gradle index cd6f4945..1979d8cd 100644 --- a/pulltorefresh/build.gradle +++ b/pulltorefresh/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { minSdkVersion versions.minSdk diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 0f7ee918..822c2243 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -5,7 +5,6 @@ apply from: "../gradle_scripts/code_quality.gradle" android { compileSdkVersion versions.compileSdk - buildToolsVersion versions.buildTools defaultConfig { applicationId "org.moire.ultrasonic" @@ -42,21 +41,21 @@ android { } dependencies { - compile project(':menudrawer') - compile project(':pulltorefresh') - compile project(':library') - compile project(':subsonic-api') + implementation project(':menudrawer') + implementation project(':pulltorefresh') + implementation project(':library') + implementation project(':subsonic-api') - compile androidSupport.support - compile androidSupport.design + implementation androidSupport.support + implementation androidSupport.design - compile other.kotlinStdlib + implementation other.kotlinStdlib - testCompile other.kotlinReflect - testCompile testing.junit - testCompile testing.kotlinJunit - testCompile testing.mockitoKotlin - testCompile testing.kluent + testImplementation other.kotlinReflect + testImplementation testing.junit + testImplementation testing.kotlinJunit + testImplementation testing.mockitoKotlin + testImplementation testing.kluent } // Excluding all non-kotlin classes