From 3eab46d7f965ba16d6b80ffff846b3cc2f9abc7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 20 May 2015 18:37:05 +0200
Subject: [PATCH] Group compileOptions together

---
 F-Droid/build.gradle | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index b9e2a67a0..a9a4e4a57 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -129,11 +129,6 @@ android {
     compileSdkVersion 21
     buildToolsVersion '22.0.1'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -163,7 +158,18 @@ android {
         }
     }
 
-    compileOptions.encoding = "UTF-8"
+    compileOptions {
+        compileOptions.encoding = "UTF-8"
+
+        // Use Java 1.7, requires minSdk 8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 
     // Enable all Android lint warnings
     gradle.projectsEvaluated {
@@ -172,10 +178,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
 }
 
 // This person took the example code below from another blogpost online, however