Disable java7 build, instead set sourceCompatibility and targetCompatibility

master
cpfeiffer 2016-08-26 23:27:53 +02:00
parent 20be49b717
commit e81c1bdc28
3 changed files with 9 additions and 2 deletions

View File

@ -2,7 +2,8 @@ language: android
jdk: jdk:
- oraclejdk8 - oraclejdk8
- oraclejdk7 # disabled -- we now set sourceCompatibility and targetCompatibility appropriately
# - oraclejdk7
env: env:
- GRADLE_OPTS="-XX:MaxPermSize=256m" - GRADLE_OPTS="-XX:MaxPermSize=256m"

View File

@ -9,6 +9,12 @@ tasks.withType(Test) { systemProperty 'MiFirmwareDir', System.getProperty('MiFir
// sourceSets.test.runtimeClasspath += File('src/main/assets') // sourceSets.test.runtimeClasspath += File('src/main/assets')
android { android {
compileOptions {
// for KitKat
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion "23.0.3"

View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files