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 diff --git a/build.gradle b/build.gradle index 79ea1429d..e9c7dde8b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,17 @@ - - buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.2.1' } } allprojects { repositories { - mavenLocal() + google() jcenter() } } diff --git a/demo/build.gradle b/demo/build.gradle index cf5b8f5f1..895ce19b5 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,19 +1,18 @@ 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 { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + 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 57a43a9b6..01186c38d 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.10.2-all.zip diff --git a/library/build.gradle b/library/build.gradle index b3f25eea8..362dbdaab 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,9 +5,7 @@ dependencies { } android { - compileSdkVersion 25 - - buildToolsVersion '25.0.2' + compileSdkVersion 28 resourcePrefix 'amu_'