Group compileOptions together

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