From d369cd387644308fefdfa2a99559576c7be566a6 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 12 May 2014 18:54:26 +0200
Subject: [PATCH] Moved build to gradle.

---
 .gitignore                                    |   2 +
 README.md                                     |   2 +-
 build.gradle                                  |  62 +++++++++++
 build.sh                                      |   2 +
 build.xml                                     | 103 ------------------
 .../main/AndroidManifest.xml                  |   0
 .../syncthingandroid/SettingsActivity.java    |   0
 .../syncthingandroid/SyncthingService.java    |   0
 .../syncthingandroid/WebGuiActivity.java      |   0
 .../main/res}/drawable-hdpi/ic_launcher.png   | Bin
 .../main/res}/drawable-mdpi/ic_launcher.png   | Bin
 .../main/res}/drawable-xhdpi/ic_launcher.png  | Bin
 .../main/res}/drawable-xxhdpi/ic_launcher.png | Bin
 .../res}/drawable-xxxhdpi/ic_launcher.png     | Bin
 {res => src/main/res}/layout/main.xml         |   0
 {res => src/main/res}/menu/menu.xml           |   0
 {res => src/main/res}/raw/config_default.xml  |   0
 {res => src/main/res}/values/strings.xml      |   0
 {res => src/main/res}/xml/settings.xml        |   0
 19 files changed, 67 insertions(+), 104 deletions(-)
 create mode 100644 build.gradle
 delete mode 100644 build.xml
 rename AndroidManifest.xml => src/main/AndroidManifest.xml (100%)
 rename src/{ => main/java}/com/nutomic/syncthingandroid/SettingsActivity.java (100%)
 rename src/{ => main/java}/com/nutomic/syncthingandroid/SyncthingService.java (100%)
 rename src/{ => main/java}/com/nutomic/syncthingandroid/WebGuiActivity.java (100%)
 rename {res => src/main/res}/drawable-hdpi/ic_launcher.png (100%)
 rename {res => src/main/res}/drawable-mdpi/ic_launcher.png (100%)
 rename {res => src/main/res}/drawable-xhdpi/ic_launcher.png (100%)
 rename {res => src/main/res}/drawable-xxhdpi/ic_launcher.png (100%)
 rename {res => src/main/res}/drawable-xxxhdpi/ic_launcher.png (100%)
 rename {res => src/main/res}/layout/main.xml (100%)
 rename {res => src/main/res}/menu/menu.xml (100%)
 rename {res => src/main/res}/raw/config_default.xml (100%)
 rename {res => src/main/res}/values/strings.xml (100%)
 rename {res => src/main/res}/xml/settings.xml (100%)

diff --git a/.gitignore b/.gitignore
index cc86d387..d91778ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,11 @@
 
 # generated files
 bin/
+build/
 gen/
 libs/
 obj/
+.gradle/
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/README.md b/README.md
index 026a627f..ac8c5422 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Then, apply `go.diff` to your local golang source, and compile it.
 
 For syncthing, use [my fork](https://github.com/Nutomic/syncthing/tree/android).
 
-To compile, run `./build.sh` (go cross compile) and `ant -f build.xml clean debug install run` (Android package).
+To compile, run `gradle assembleDebug`.
 
 ## License
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..6ce0b384
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,62 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.9.0+'
+        classpath 'com.alexvasilkov:android_sign:0.2'
+    }
+}
+
+apply plugin: 'android'
+apply plugin: 'android_sign'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.0.3"
+    sourceSets {
+		main {
+			jniLibs.srcDir file("libs/")
+			jniLibs.srcDir file("obj/")
+		}
+	}
+    signingConfigs {
+        release {
+            // Android Studio does not pass environment variables.
+            // This means you have to use the command line for release builds.
+            def ks = System.getenv("KEYSTORE")
+            def ka = System.getenv("KEY_ALIAS")
+            if (ks != null && ka != null) {
+                storeFile file(ks)
+                keyAlias ka
+            }
+        }
+    }
+
+    buildTypes {
+        debug {
+			// FIXME: We can't use this as long as the data folder is hardcoded.
+            // packageNameSuffix ".debug"
+            debuggable true
+        }
+        release {
+            signingConfig signingConfigs.release
+        }
+    }
+}
+
+task buildNative(type: Exec) {
+    exec {
+		executable = './build.sh'
+    }
+}
+// FIXME: buildNative is also executed on clean
+assemble.dependsOn buildNative
+
+task cleanNative(type: Delete) {
+    delete "libs"
+    delete "obj"
+}
+clean.dependsOn cleanNative
+
diff --git a/build.sh b/build.sh
index d2fd8e9d..07d1384d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "Building native syncthing"
+
 set -e
 
 mkdir -p libs/armeabi-v7a
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 046ac68b..00000000
--- a/build.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="syncthing" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-	
-    <target name="run">
-        <exec executable="adb">
-            <arg value="shell"/>
-            <arg value="am"/>
-            <arg value="start"/>
-            <arg value="-a"/>
-            <arg value="android.intent.action.MAIN"/>
-            <arg value="-n"/>
-            <arg value="com.nutomic.syncthingandroid/.WebGuiActivity"/>
-        </exec>
-    </target>
-</project>
diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to src/main/AndroidManifest.xml
diff --git a/src/com/nutomic/syncthingandroid/SettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/SettingsActivity.java
similarity index 100%
rename from src/com/nutomic/syncthingandroid/SettingsActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/SettingsActivity.java
diff --git a/src/com/nutomic/syncthingandroid/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/SyncthingService.java
similarity index 100%
rename from src/com/nutomic/syncthingandroid/SyncthingService.java
rename to src/main/java/com/nutomic/syncthingandroid/SyncthingService.java
diff --git a/src/com/nutomic/syncthingandroid/WebGuiActivity.java b/src/main/java/com/nutomic/syncthingandroid/WebGuiActivity.java
similarity index 100%
rename from src/com/nutomic/syncthingandroid/WebGuiActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/WebGuiActivity.java
diff --git a/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher.png
rename to src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher.png
rename to src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher.png
rename to src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_launcher.png
rename to src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xxxhdpi/ic_launcher.png
rename to src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/res/layout/main.xml b/src/main/res/layout/main.xml
similarity index 100%
rename from res/layout/main.xml
rename to src/main/res/layout/main.xml
diff --git a/res/menu/menu.xml b/src/main/res/menu/menu.xml
similarity index 100%
rename from res/menu/menu.xml
rename to src/main/res/menu/menu.xml
diff --git a/res/raw/config_default.xml b/src/main/res/raw/config_default.xml
similarity index 100%
rename from res/raw/config_default.xml
rename to src/main/res/raw/config_default.xml
diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to src/main/res/values/strings.xml
diff --git a/res/xml/settings.xml b/src/main/res/xml/settings.xml
similarity index 100%
rename from res/xml/settings.xml
rename to src/main/res/xml/settings.xml