From e5be55c7b8a2f58c410eeaad8dfb3abbfdac5e03 Mon Sep 17 00:00:00 2001 From: Alex Muramoto Date: Fri, 19 Apr 2019 09:42:51 -0700 Subject: [PATCH] Update gradle files to resolve build errors in tutorials (#118) * upgrade gradle version and gradle file * update gradle for mapwithmarker tutorial * update gradle for polygons tutorial * update gradle for styled map tutorial --- .../CurrentPlaceDetailsOnMap/app/build.gradle | 12 ++++++------ tutorials/CurrentPlaceDetailsOnMap/build.gradle | 3 ++- .../CurrentPlaceDetailsOnMap/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/MapWithMarker/app/build.gradle | 14 +++++++------- tutorials/MapWithMarker/build.gradle | 3 ++- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/Polygons/app/build.gradle | 14 +++++++------- tutorials/Polygons/build.gradle | 3 ++- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tutorials/StyledMap/app/build.gradle | 14 +++++++------- tutorials/StyledMap/build.gradle | 3 ++- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 13 files changed, 44 insertions(+), 40 deletions(-) diff --git a/tutorials/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/CurrentPlaceDetailsOnMap/app/build.gradle index 4fcd9ba1..1a4ddc2f 100644 --- a/tutorials/CurrentPlaceDetailsOnMap/app/build.gradle +++ b/tutorials/CurrentPlaceDetailsOnMap/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.example.currentplacedetailsonmap" minSdkVersion 15 @@ -24,11 +24,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.google.android.gms:play-services:11.2.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:25.1.1' + implementation 'com.google.android.gms:play-services:11.2.0' + testImplementation'junit:junit:4.12' } diff --git a/tutorials/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/CurrentPlaceDetailsOnMap/build.gradle index 32cd24a9..e8bf3d36 100644 --- a/tutorials/CurrentPlaceDetailsOnMap/build.gradle +++ b/tutorials/CurrentPlaceDetailsOnMap/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradle.properties b/tutorials/CurrentPlaceDetailsOnMap/gradle.properties index 547d3e07..5ada0909 100644 --- a/tutorials/CurrentPlaceDetailsOnMap/gradle.properties +++ b/tutorials/CurrentPlaceDetailsOnMap/gradle.properties @@ -19,4 +19,4 @@ org.gradle.jvmargs=-Xmx1536m # Replace the value below with your own Google API key for Android app. # To learn how to get a Google Maps Platform API key, visit: # https://developers.google.com/maps/documentation/android-sdk/start#step_4_get_a_google_maps_api_key -GOOGLE_MAPS_API_KEY=AIzaSyDqvjPj18uoo4DgyFEey0dCMhV2UQhmkAI +GOOGLE_MAPS_API_KEY=YOUR_API_KEY diff --git a/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 122ec702..f97c4ac3 100644 --- a/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 15 11:46:14 PDT 2017 +#Wed Apr 17 15:25:06 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/tutorials/MapWithMarker/app/build.gradle b/tutorials/MapWithMarker/app/build.gradle index 47bde588..5d99188b 100644 --- a/tutorials/MapWithMarker/app/build.gradle +++ b/tutorials/MapWithMarker/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 24 - buildToolsVersion "23.0.3" + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.example.mapwithmarker" minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -21,11 +21,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('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' - compile 'com.google.android.gms:play-services:9.8.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:24.2.1' + implementation 'com.google.android.gms:play-services:9.8.0' + testImplementation 'junit:junit:4.12' } diff --git a/tutorials/MapWithMarker/build.gradle b/tutorials/MapWithMarker/build.gradle index c20bca14..2cb309cb 100644 --- a/tutorials/MapWithMarker/build.gradle +++ b/tutorials/MapWithMarker/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/tutorials/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 04e285f3..463387e4 100644 --- a/tutorials/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Apr 17 15:30:10 PDT 2019 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.6-all.zip diff --git a/tutorials/Polygons/app/build.gradle b/tutorials/Polygons/app/build.gradle index 50f61910..0c2a3b4e 100644 --- a/tutorials/Polygons/app/build.gradle +++ b/tutorials/Polygons/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.example.polygons" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -21,14 +21,14 @@ android { } dependencies { - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.google.android.gms:play-services-maps:10.2.0' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:25.1.1' + implementation 'com.google.android.gms:play-services-maps:10.2.0' } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) } diff --git a/tutorials/Polygons/build.gradle b/tutorials/Polygons/build.gradle index 74b2ab0d..2cb309cb 100644 --- a/tutorials/Polygons/build.gradle +++ b/tutorials/Polygons/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/tutorials/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/Polygons/gradle/wrapper/gradle-wrapper.properties index 04e285f3..a130918d 100644 --- a/tutorials/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Apr 17 17:26:38 PDT 2019 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.6-all.zip diff --git a/tutorials/StyledMap/app/build.gradle b/tutorials/StyledMap/app/build.gradle index 80ba7c5b..f96ff1de 100644 --- a/tutorials/StyledMap/app/build.gradle +++ b/tutorials/StyledMap/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.example.styledmap" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -21,11 +21,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.0.1' - compile 'com.google.android.gms:play-services:9.8.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:25.0.1' + implementation 'com.google.android.gms:play-services:9.8.0' + testImplementation 'junit:junit:4.12' } diff --git a/tutorials/StyledMap/build.gradle b/tutorials/StyledMap/build.gradle index c20bca14..2cb309cb 100644 --- a/tutorials/StyledMap/build.gradle +++ b/tutorials/StyledMap/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/tutorials/StyledMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/StyledMap/gradle/wrapper/gradle-wrapper.properties index 04e285f3..26c73db4 100644 --- a/tutorials/StyledMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/StyledMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Apr 17 17:28:49 PDT 2019 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.6-all.zip