From 7e417f195b0dd1da9fe0dbe02af65d9c53e6500f Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 2 Jan 2019 09:18:02 +0100 Subject: [PATCH 1/4] Updated Gradle to 3.2.1 --- build.gradle | 11 +++++++++-- demo/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 79ea1429d..df2779b45 100644 --- a/build.gradle +++ b/build.gradle @@ -3,17 +3,24 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.2.1' } } allprojects { repositories { - mavenLocal() jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } diff --git a/demo/build.gradle b/demo/build.gradle index cf5b8f5f1..162b48eda 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -9,7 +9,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion "25.0.1" + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57a43a9b6..41c6874b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 29 17:27:18 CEST 2017 +#Mon Dec 10 16:14:53 CET 2018 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/library/build.gradle b/library/build.gradle index b3f25eea8..8b7a4085f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,7 +7,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion '25.0.2' + buildToolsVersion '28.0.3' resourcePrefix 'amu_' From 0ce62c9c9a89dd43af39b51f197a735e39d7d888 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 2 Jan 2019 09:03:16 +0100 Subject: [PATCH 2/4] Android P; Gradle 4.10 for this google() must be on first place --- build.gradle | 10 ++-------- demo/build.gradle | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 4 +--- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index df2779b45..06dc477d8 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,8 @@ buildscript { repositories { + google() jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } } dependencies { @@ -16,11 +13,8 @@ buildscript { allprojects { repositories { + google() jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } } } diff --git a/demo/build.gradle b/demo/build.gradle index 162b48eda..246d766a7 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -8,12 +8,11 @@ dependencies { } android { - compileSdkVersion 25 - buildToolsVersion '28.0.3' + compileSdkVersion 28 defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 } sourceSets { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41c6874b5..01186c38d 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-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/library/build.gradle b/library/build.gradle index 8b7a4085f..362dbdaab 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,9 +5,7 @@ dependencies { } android { - compileSdkVersion 25 - - buildToolsVersion '28.0.3' + compileSdkVersion 28 resourcePrefix 'amu_' From 8a4d795a7192124c017f242cc7e7fc5f641e6122 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 2 Jan 2019 09:04:37 +0100 Subject: [PATCH 3/4] simplify Travis --- .travis.yml | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index c69b6408f..d9a07373b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,32 +3,15 @@ jdk: oraclejdk8 # Use the Travis Container-Based Infrastructure sudo: false -cache: - directories: - - ${TRAVIS_BUILD_DIR}/gradle/caches/ - - ${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/ - -env: - global: - - ANDROID_API_LEVEL=25 - - ANDROID_BUILD_TOOLS_VERSION=25.0.1 - android: components: - - tools # to get the new `repository-11.xml` - - platform-tools - - tools # to install Android SDK tools 25.1.x - - build-tools-$ANDROID_BUILD_TOOLS_VERSION - - android-$ANDROID_API_LEVEL - # For Google APIs - - addon-google_apis-google-$ANDROID_API_LEVEL - # Google Play Services - - extra-google-google_play_services - # Support library - - extra-android-support - # Latest artifacts in local repository - - extra-google-m2repository + - build-tools-28.0.3 + - android-28 - extra-android-m2repository + - extra-google-m2repository + - extra-google-google_play_services + licenses: + - 'android-sdk-license-.+' script: - ./gradlew clean assembleDebug -x library:signArchives -PdisablePreDex From ce41ddb2feda06763f295fd9743bdf0036c64da2 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 2 Jan 2019 09:10:01 +0100 Subject: [PATCH 4/4] use implementation instead of compile --- build.gradle | 2 -- demo/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 06dc477d8..e9c7dde8b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ - - buildscript { repositories { google() diff --git a/demo/build.gradle b/demo/build.gradle index 246d766a7..895ce19b5 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' dependencies { - compile project(':library') + implementation project(':library') // Or, fetch from Maven: // compile 'com.google.maps.android:android-maps-utils:0.3+' - compile 'com.google.android.gms:play-services-maps:11.0.4' + implementation 'com.google.android.gms:play-services-maps:11.0.4' } android {