From c7ee1a9a99cc8c6a9fb427fb84eb973a2293f47e Mon Sep 17 00:00:00 2001 From: IgorGanapolsky Date: Wed, 2 Sep 2015 12:52:26 -0400 Subject: [PATCH 1/3] Update latest gradle versions and android dependencies. --- build.gradle | 2 +- demo/build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index f86b79434..541cead09 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,6 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.3.0' } } diff --git a/demo/build.gradle b/demo/build.gradle index e47619c8a..f714ac8a9 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -14,12 +14,12 @@ dependencies { compile project(':library') // Or, fetch from Maven: // compile 'com.google.maps.android:android-maps-utils:0.3+' - compile 'com.google.android.gms:play-services:6.+' + compile 'com.google.android.gms:play-services:7.8.0' } android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion "23.0.0" sourceSets { main { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 809514d86..1630ae4af 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.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index b38eb26d0..4a7d9fd42 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -16,13 +16,13 @@ archivesBaseName = 'android-maps-utils' group = 'com.google.maps.android' dependencies { - compile 'com.google.android.gms:play-services:6.+' + compile 'com.google.android.gms:play-services:7.8.0' } android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion "23.0.0" sourceSets { main { From 620c846ef7868a1946ffe341f5018fcf6a91f70d Mon Sep 17 00:00:00 2001 From: IgorGanapolsky Date: Wed, 2 Sep 2015 12:59:29 -0400 Subject: [PATCH 2/3] Revert indendation in gradle file. --- library/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 4a7d9fd42..78a2aec71 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -16,13 +16,13 @@ archivesBaseName = 'android-maps-utils' group = 'com.google.maps.android' dependencies { - compile 'com.google.android.gms:play-services:7.8.0' + compile 'com.google.android.gms:play-services:7.8.0' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.0" sourceSets { main { @@ -60,10 +60,10 @@ signing { sign configurations.archives } -if(!hasProperty("sonatypeUsername")){ +if (!hasProperty("sonatypeUsername")) { sonatypeUsername = "" } -if(!hasProperty("sonatypePassword")){ +if (!hasProperty("sonatypePassword")) { sonatypePassword = "" } From 3050e09f2ba98cbe3e1021f3d574a0060b3286ed Mon Sep 17 00:00:00 2001 From: IgorGanapolsky Date: Wed, 2 Sep 2015 13:08:41 -0400 Subject: [PATCH 3/3] Revert indendation in gradle files. --- build.gradle | 2 +- demo/build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 541cead09..a953b8340 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,6 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } diff --git a/demo/build.gradle b/demo/build.gradle index f714ac8a9..24ceec018 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -14,12 +14,12 @@ dependencies { compile project(':library') // Or, fetch from Maven: // compile 'com.google.maps.android:android-maps-utils:0.3+' - compile 'com.google.android.gms:play-services:7.8.0' + compile 'com.google.android.gms:play-services:7.8.0' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.0" sourceSets { main {