Merge branch 'beta' of https://github.com/owncloud/android into beta

diff --git a/.travis.yml b/.travis.yml
index 0db9b1e..1d64863 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ before_install:
   - rm pom.xml
 script:
   - ./setup_env.sh ant
-  - ant clean
-  - ant debug
+  - ant clean -Djava.source=7 -Djava.target=7
+  - ant debug -Djava.source=7 -Djava.target=7