From eea7ff3c927234e6d958fc8bff92938bcdef1010 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Mon, 8 Feb 2016 03:25:20 +0100
Subject: [PATCH] Update Travis CI config

---
 .travis.yml                  | 18 ++++++++++++------
 extern/UnifiedNlpApi         |  2 +-
 unifiednlp-base/build.gradle |  6 ++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c90c5dc..1f8c07c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,22 @@ git:
   submodules: false
 before_install:
   - git submodule update --init --recursive
-script:
-  - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
-  - export TERM=dumb
+before_script:
   - echo sdk.dir $ANDROID_HOME > local.properties
-  - ./gradlew assembleDebug -x lint
+script:
+  - 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.2
   - android-23
   - extra-android-m2repository
-
-
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
diff --git a/extern/UnifiedNlpApi b/extern/UnifiedNlpApi
index 25d8b47..a818694 160000
--- a/extern/UnifiedNlpApi
+++ b/extern/UnifiedNlpApi
@@ -1 +1 @@
-Subproject commit 25d8b478eb2497803ffb8c5c45d186adb6b64850
+Subproject commit a818694d1d27601d9f00d0fbf36f8eff7f6a15fd
diff --git a/unifiednlp-base/build.gradle b/unifiednlp-base/build.gradle
index 63db801..c9c875e 100644
--- a/unifiednlp-base/build.gradle
+++ b/unifiednlp-base/build.gradle
@@ -45,6 +45,12 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
+
+    lintOptions {
+        // TODO: Remove MissingTranslation once we have stable strings and proper translations.
+        // TODO: Remove ManifestResource once gradle build tools > 1.5.0 (Issue 194705)
+        disable 'MissingTranslation', 'ManifestResource'
+    }
 }
 
 dependencies {