From e81c1bdc288932c71125d6b40bb244bfd6d91102 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Fri, 26 Aug 2016 23:27:53 +0200
Subject: [PATCH] Disable java7 build, instead set sourceCompatibility and
 targetCompatibility

---
 .travis.yml      | 3 ++-
 app/build.gradle | 6 ++++++
 build.gradle     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d58ee5f86..2084cb1fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,8 @@ language: android
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
+# disabled -- we now set sourceCompatibility and targetCompatibility appropriately
+#  - oraclejdk7
 
 env:
   - GRADLE_OPTS="-XX:MaxPermSize=256m"
diff --git a/app/build.gradle b/app/build.gradle
index 6ff8c87a3..f7675008b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,6 +9,12 @@ tasks.withType(Test) { systemProperty 'MiFirmwareDir', System.getProperty('MiFir
 // sourceSets.test.runtimeClasspath += File('src/main/assets')
 
 android {
+
+    compileOptions {
+        // for KitKat
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
     compileSdkVersion 23
     buildToolsVersion "23.0.3"
 
diff --git a/build.gradle b/build.gradle
index a93003813..912050fc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.2.0-beta2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files