diff --git a/.travis.yml b/.travis.yml index 8f34e4b..2b00527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/build.gradle b/build.gradle index 499598f..c02fd47 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { allprojects { apply plugin: 'idea' - ext.androidBuildVersionTools = "24.0.2" + ext.androidBuildVersionTools = "24.0.3" } def androidCompileSdk() { return 24 } diff --git a/extern/UnifiedNlpApi b/extern/UnifiedNlpApi index 62841ac..6662510 160000 --- a/extern/UnifiedNlpApi +++ b/extern/UnifiedNlpApi @@ -1 +1 @@ -Subproject commit 62841ac0e297972e008643c11d2c4d2477a73425 +Subproject commit 6662510fedc280171a8ed08185645e92eaf21999 diff --git a/unifiednlp-compat/build.gradle b/unifiednlp-compat/build.gradle index 2cb2af1..d22f450 100644 --- a/unifiednlp-compat/build.gradle +++ b/unifiednlp-compat/build.gradle @@ -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") }