From 896cf460b5478091d82d686a7353bd97b32ce05f Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:01:39 -0200 Subject: [PATCH 1/8] Adding versions to run on Android Studio 3.0 and updating dependencies to the last available version --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index c42821b..4596498 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,13 @@ // 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 = 16 + ext.target_sdk_version = 27 + + ext.support_version = '27.0.0' + ext.play_services_version = '11.4.2' repositories { jcenter() mavenCentral() From 58b4556f59f5b178e46077700e91d6cf7ee4b4fa Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:02:16 -0200 Subject: [PATCH 2/8] Adding google() maven repo --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 4596498..ef6d423 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,9 @@ buildscript { ext.support_version = '27.0.0' ext.play_services_version = '11.4.2' + repositories { + google() jcenter() mavenCentral() } @@ -26,6 +28,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } From 29025e64fa95cb05a6966e84729a6a7519156d06 Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:03:44 -0200 Subject: [PATCH 3/8] Updating gradle wrapper version from '2.14.1' to '4.1' --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5efadd852c816e1fcb444f3af3c7bcb4907ca5ee Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:05:03 -0200 Subject: [PATCH 4/8] Fixing minSdkVersion to old value. API 15 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ef6d423..a683bc2 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.compile_sdk_version = 27 ext.build_tools_version = '27.0.0' - ext.min_sdk_version = 16 + ext.min_sdk_version = 15 ext.target_sdk_version = 27 ext.support_version = '27.0.0' From e85fd6c931d01e81d1dc73b8dbac46ca27a006d4 Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:20:21 -0200 Subject: [PATCH 5/8] Updating butterknife version from '8.4.0' to '8.8.0' Changing 'apt' by 'annotationProcessor' --- app/build.gradle | 5 ++--- build.gradle | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1510768..8e34657 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' //noinspection GroovyMissingReturnStatement,GroovyMissingReturnStatement android { @@ -23,9 +22,9 @@ 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" diff --git a/build.gradle b/build.gradle index a683bc2..58facd1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { ext.support_version = '27.0.0' ext.play_services_version = '11.4.2' + ext.butterknife_version = '8.8.0' repositories { google() From 2854ca67d47ec17c927c6ab403e1250d1332c3ad Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:21:49 -0200 Subject: [PATCH 6/8] Start to using configs from external build.gradle --- android-easylocation/build.gradle | 8 ++++---- app/build.gradle | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android-easylocation/build.gradle b/android-easylocation/build.gradle index 4b4aa0e..8f726e9 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" diff --git a/app/build.gradle b/app/build.gradle index 8e34657..546352f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,13 @@ apply plugin: 'com.android.application' //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" From c2d9d7b97e6c3e99ebe5208a57f6d76b1cec15cf Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:22:34 -0200 Subject: [PATCH 7/8] Updating gradle build version from '2.2.2' to '3.0.0' --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 58facd1..e9aa643 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { 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' From e2d29cb6e372b2b45c01456143b5c754056e6e94 Mon Sep 17 00:00:00 2001 From: Luis Fernandez Date: Sun, 5 Nov 2017 14:23:01 -0200 Subject: [PATCH 8/8] Start to using dependencies versions from external build.gradle --- android-easylocation/build.gradle | 7 +++++-- app/build.gradle | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/android-easylocation/build.gradle b/android-easylocation/build.gradle index 8f726e9..fcba0f9 100644 --- a/android-easylocation/build.gradle +++ b/android-easylocation/build.gradle @@ -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 546352f..cd40128 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,16 +23,19 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - 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') }