From 6daa429a4d151b85563bd065adf7045c7c536dfe Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sun, 28 Jun 2015 17:43:43 +0200
Subject: [PATCH] Cleaned up build.gradle.

---
 build.gradle                 | 22 ++++++----------------
 src/main/AndroidManifest.xml |  8 +-------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index e16c4ab3..e9fe745e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,12 +7,10 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.10.1'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3'
     }
 }
 
-import java.util.regex.Pattern
-
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.ben-manes.versions'
 
@@ -44,7 +42,11 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        versionCode getVersionCodeFromManifest()
+        applicationId "com.nutomic.syncthingandroid"
+        minSdkVersion 8
+        targetSdkVersion 22
+        versionCode 70
+        versionName "0.6.4"
         testApplicationId 'com.nutomic.syncthingandroid.test'
         testInstrumentationRunner 'android.test.InstrumentationTestRunner'
         testHandleProfiling true
@@ -100,18 +102,6 @@ android {
             versionCode Integer.parseInt("0" + defaultConfig.versionCode)
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-}
-
-def getVersionCodeFromManifest() {
-    def manifestFile = file(android.sourceSets.main.manifest.srcFile)
-    def pattern = Pattern.compile("versionCode=\"(\\d+)\"")
-    def matcher = pattern.matcher(manifestFile.getText())
-    matcher.find()
-    return Integer.parseInt(matcher.group(1))
 }
 
 task buildNative(type: Exec) {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ae150c38..84452c36 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.nutomic.syncthingandroid"
-    android:versionCode="70"
-    android:versionName="0.6.4" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="22" />
+    package="com.nutomic.syncthingandroid">
 
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />