Update Travis config and sublib
This commit is contained in:
parent
06fd488940
commit
2f810b14fd
|
@ -7,15 +7,16 @@ before_install:
|
||||||
before_script:
|
before_script:
|
||||||
- echo sdk.dir $ANDROID_HOME > local.properties
|
- echo sdk.dir $ANDROID_HOME > local.properties
|
||||||
script:
|
script:
|
||||||
|
- jdk_switcher use oraclejdk8
|
||||||
- export TERM=dumb
|
- export TERM=dumb
|
||||||
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
|
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
|
||||||
- ./gradlew build
|
- ./gradlew build
|
||||||
android:
|
android:
|
||||||
components:
|
components:
|
||||||
- platform-tools
|
|
||||||
- tools
|
- tools
|
||||||
- build-tools-23.0.3
|
- platform-tools
|
||||||
- android-23
|
- build-tools-24.0.3
|
||||||
|
- android-24
|
||||||
- extra-android-m2repository
|
- extra-android-m2repository
|
||||||
before_cache:
|
before_cache:
|
||||||
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
||||||
|
|
|
@ -26,7 +26,7 @@ buildscript {
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
ext.androidBuildVersionTools = "24.0.2"
|
ext.androidBuildVersionTools = "24.0.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
def androidCompileSdk() { return 24 }
|
def androidCompileSdk() { return 24 }
|
||||||
|
|
2
extern/UnifiedNlpApi
vendored
2
extern/UnifiedNlpApi
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 62841ac0e297972e008643c11d2c4d2477a73425
|
Subproject commit 6662510fedc280171a8ed08185645e92eaf21999
|
|
@ -25,5 +25,5 @@ if (!sdkDir) {
|
||||||
|
|
||||||
sourceSets.main {
|
sourceSets.main {
|
||||||
java.srcDirs = ['src/current/java', 'src/v9/java']
|
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")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue