diff --git a/android-easylocation/build.gradle b/android-easylocation/build.gradle index 4b4aa0e..fcba0f9 100644 --- a/android-easylocation/build.gradle +++ b/android-easylocation/build.gradle @@ -24,12 +24,12 @@ ext { } //noinspection GroovyMissingReturnStatement android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion rootProject.ext.compile_sdk_version + buildToolsVersion rootProject.ext.build_tools_version defaultConfig { - minSdkVersion 15 - targetSdkVersion 24 + minSdkVersion rootProject.ext.min_sdk_version + targetSdkVersion rootProject.ext.target_sdk_version versionCode 1 versionName "1.0.2" @@ -46,12 +46,15 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - provided "com.google.android.gms:play-services-location:9.2.0" + provided ("com.google.android.gms:play-services-location:$play_services_version") { + exclude group: "com.android.support", module: "support-v4" + exclude group: "com.android.support", module: "support-media-compat" + } androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' + implementation "com.android.support:appcompat-v7:$support_version" testCompile 'junit:junit:4.12' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' diff --git a/app/build.gradle b/app/build.gradle index 1510768..cd40128 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' //noinspection GroovyMissingReturnStatement,GroovyMissingReturnStatement android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion rootProject.ext.compile_sdk_version + buildToolsVersion rootProject.ext.build_tools_version + defaultConfig { applicationId "com.akhgupta.easylocation.demo" - minSdkVersion 15 - targetSdkVersion 24 + minSdkVersion rootProject.ext.min_sdk_version + targetSdkVersion rootProject.ext.target_sdk_version versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -23,16 +23,19 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.jakewharton:butterknife:8.4.0' - apt 'com.jakewharton:butterknife-compiler:8.4.0' - compile "com.google.android.gms:play-services-location:9.6.0" + compile "com.jakewharton:butterknife:$butterknife_version" + annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version" + implementation ("com.google.android.gms:play-services-location:$play_services_version") { + exclude group: "com.android.support", module: "support-v4" + exclude group: "com.android.support", module: "support-media-compat" + } androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' + implementation "com.android.support:appcompat-v7:$support_version" testCompile 'junit:junit:4.12' compile project(':android-easylocation') } diff --git a/build.gradle b/build.gradle index c42821b..e9aa643 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,22 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.compile_sdk_version = 27 + ext.build_tools_version = '27.0.0' + ext.min_sdk_version = 15 + ext.target_sdk_version = 27 + + ext.support_version = '27.0.0' + ext.play_services_version = '11.4.2' + ext.butterknife_version = '8.8.0' + repositories { + google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' @@ -19,6 +29,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..fc9b829 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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-4.1-all.zip