Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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()
}
}
Expand Down
9 changes: 4 additions & 5 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ dependencies {
}

android {
compileSdkVersion 25

buildToolsVersion '25.0.2'
compileSdkVersion 28

resourcePrefix 'amu_'

Expand Down