浏览代码

Merge pull request #1321 from owncloud/updateToJava7

Force ant and android studio to use Java7
Bartosz Przybylski 9 年之前
父节点
当前提交
d3afbb2972
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 7 4
      build.gradle
  2. 2 0
      project.properties

+ 7 - 4
build.gradle

@@ -53,10 +53,13 @@ android {
         release.setRoot('build-types/release')
     }
 
-    android {
-        lintOptions {
-            abortOnError false
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    lintOptions {
+        abortOnError false
     }
 
     productFlavors {

+ 2 - 0
project.properties

@@ -11,3 +11,5 @@
 target=android-22
 android.library.reference.1=owncloud-android-library
 android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar
+java.source=7
+java.target=7