From 968d6db3b8947e39d7c62d1f3309a9f48cd00bdc Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 10 Apr 2015 11:49:10 +0200
Subject: [PATCH] add Gradle/Android Studio support

---
 .gitignore   |  46 ++++++++++++++++++++---
 README.md    |  17 +++++++--
 build.gradle |  49 ++++++++++++++++++++++++
 build.xml    | 104 ---------------------------------------------------
 4 files changed, 102 insertions(+), 114 deletions(-)
 create mode 100644 build.gradle
 delete mode 100644 build.xml

diff --git a/.gitignore b/.gitignore
index 8d9e3380..e9489c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,44 @@
+# Source: https://raw.githubusercontent.com/github/gitignore/master/Android.gitignore
+
+# Built application files
 *.apk
-bin
-gen
-.*
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
-*.ipr
-*.iws
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Source: http://stackoverflow.com/a/17803964
+.DS_Store
+
+# Source: https://gitlab.com/fdroid/fdroidclient/raw/master/.gitignore
+build.xml
+gradlew
+gradlew.bat
+gradle-wrapper.jar
+gradle-wrapper.properties
+*~
+*.swp
+.idea/
 *.iml
 out
-doc
+.settings/
diff --git a/README.md b/README.md
index 322369e4..7ec236f9 100644
--- a/README.md
+++ b/README.md
@@ -20,15 +20,24 @@ Building
 ========
 To build you will need:
 
- * A Java compiler compatible with Java 1.6
- * The Android SDK with platform 16 (JellyBean) installed
+ * A Java compiler compatible with Java 1.8
+ * The Android SDK with platform 22 (Lollipop) installed
 
-Building from command-line
+Building from command-line #1
+--------------------------
+ * `gradle build` to build the APK
+ * Optional: `gradle installDebug` to install the APK to a connected device
+ 
+Building from command-line #2
 --------------------------
  * `android update project --path .` to generate local.properties
  * `ant debug` to build the APK at bin/VanillaMusic-debug.apk
  * Optional: `ant installd` to install the APK to a connected device
 
+Building with Android Studio
+---------------------
+You can also build with Android Studio by importing this project into it.
+
 Building from Eclipse
 ---------------------
 You can also build from Eclipse. Create a new Android Project, choosing "Create
@@ -37,7 +46,7 @@ in project settings.
 
 Documentation
 =============
-Javadocs can be generated using `ant doc`
+Javadocs can be generated using `gradle javadoc` or `ant doc`
 
 
   [1]: https://www.transifex.com/projects/p/vanilla-music-1/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..4c18c0e7
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,49 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        applicationId "ch.blinkenlights.android.vanilla"
+        minSdkVersion 15
+        targetSdkVersion 22
+    }
+
+
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
diff --git a/build.xml b/build.xml
deleted file mode 100644
index fd59f803..00000000
--- a/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="VanillaMusic" 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. -->
-    <loadproperties srcFile="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" />
-
-    <!-- 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'"
-            unless="sdk.dir"
-    />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    /* 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} */
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- 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="doc" depends="-build-setup, -code-gen">
-        <condition property="missing-docs">
-            <not>
-                <available file="${sdk.dir}/docs/reference" type="dir" />
-            </not>
-        </condition>
-        <if condition="${missing-docs}">
-            <then>
-                <echo>Install "Documentation for Android SDK" from the Android SDK Manager to generate links to SDK documentation.</echo>
-            </then>
-        </if>
-        <javadoc
-            destdir="doc"
-            link="${sdk.dir}/docs/reference"
-            sourcepath="${source.absolute.dir}:${gen.absolute.dir}"
-            bootclasspathref="android.target.classpath"
-            classpathref="project.libraries.jars"
-            access="private" />
-    </target>
-</project>