Update Travis config and sublib

This commit is contained in:
Marvin W 2016-11-14 15:14:00 +01:00
parent 06fd488940
commit 2f810b14fd
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
4 changed files with 7 additions and 6 deletions

View File

@ -7,15 +7,16 @@ before_install:
before_script:
- echo sdk.dir $ANDROID_HOME > local.properties
script:
- jdk_switcher use oraclejdk8
- export TERM=dumb
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
- ./gradlew build
android:
components:
- platform-tools
- tools
- build-tools-23.0.3
- android-23
- platform-tools
- build-tools-24.0.3
- android-24
- extra-android-m2repository
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

View File

@ -26,7 +26,7 @@ buildscript {
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "24.0.2"
ext.androidBuildVersionTools = "24.0.3"
}
def androidCompileSdk() { return 24 }

@ -1 +1 @@
Subproject commit 62841ac0e297972e008643c11d2c4d2477a73425
Subproject commit 6662510fedc280171a8ed08185645e92eaf21999

View File

@ -25,5 +25,5 @@ if (!sdkDir) {
sourceSets.main {
java.srcDirs = ['src/current/java', 'src/v9/java']
compileClasspath += project.rootProject.files("$sdkDir/platforms/android-23/android.jar")
compileClasspath += project.rootProject.files("$sdkDir/platforms/android-24/android.jar")
}