Merge branch 'gradle-structure'

As described on https://f-droid.org/forums/topic/gradle-directory-structure/.

This will keep things a bit weird with git for a bit, but you can always use
--follow to make it take renames into account for the commit history.

I tweaked both the ant and gradle build setups and both of them work in the
new structure. And gradle is much faster since e.g. now an 'assemble' inside
F-Droid assembles only the client, without including all the subprojects as it
happens in master.

.gitignore

@@ -1,11 +1,43 @@
-/local.properties
+# Built application files
-/bin/
+*.apk
-/gen/
+*.ap_
-/build/
+
-/.gradle/
+# Files for the Dalvik VM
-/build.xml
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+build.xml
+
+# Gradle files
+.gradle/
+build/
+
+# Gradle wrapper
+gradlew
+gradlew.bat
+gradle-wrapper.jar
+gradle-wrapper.properties
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Editor swap/save files
 *~
-/.idea/
+*.swp
+
+# More IDE stuff
+.idea/
 *.iml
 out
-/.settings/
+.settings/

F-Droid/.classpath

@@ -4,7 +4,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="extern/symlinks-for-ant-and-eclipse">
+    <classpathentry kind="src" path="../extern/symlinks-for-ant-and-eclipse">
 		<attributes>
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>

F-Droid/ant-prepare.sh

@@ -0,0 +1,34 @@
+#!/bin/bash -ex
+
+EXTERN=../extern
+
+place_support_v4() {
+    mkdir -p $1/libs
+    cp libs/android-support-v4.jar $1/libs/
+}
+
+android update lib-project --path $EXTERN/UniversalImageLoader/library
+
+android update lib-project --path $EXTERN/AndroidPinning
+
+android update lib-project --path $EXTERN/MemorizingTrustManager
+
+android update lib-project --path $EXTERN/libsuperuser/libsuperuser
+
+android update lib-project --path $EXTERN/zxing-core
+
+android update lib-project --path $EXTERN/android-support-v4-preferencefragment
+place_support_v4 $EXTERN/android-support-v4-preferencefragment
+
+android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
+place_support_v4 $EXTERN/Support/v7/appcompat
+
+android update project --path . --name F-Droid
+
+{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
+
+# technically optional, needed for the tests
+cd test
+android update test-project --path . --main ..
+
+{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null

F-Droid/build.gradle

@@ -0,0 +1,72 @@
+apply plugin: 'android'
+
+dependencies {
+    compile project(':support-v4')
+    compile project(':support-appcompat-v7')
+    compile project(':extern:AndroidPinning')
+    compile project(':extern:UniversalImageLoader:library')
+    compile project(':extern:MemorizingTrustManager')
+    compile project(':extern:libsuperuser:libsuperuser')
+    compile project(':extern:nanohttpd:core')
+    compile project(':extern:jmdns')
+    compile project(':extern:zipsigner')
+    compile project(':extern:zxing-core')
+    compile( project(':extern:android-support-v4-preferencefragment') ) {
+        exclude module: 'support-v4'
+    }
+}
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion toolVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        instrumentTest.setRoot('test')
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    compileOptions.encoding = "UTF-8"
+
+    lintOptions {
+        abortOnError false
+    }
+
+}
+
+// TODO: This person took the example code below from another blogpost online, however
+// I lost the reference to it:
+// http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation
+android.applicationVariants.all { variant ->
+
+    task("generate${variant.name}Javadoc", type: Javadoc) {
+        title = "$name $version API"
+        description "Generates Javadoc for F-Droid."
+        source = variant.javaCompile.source
+        ext.androidJar = "$sdkLoc/platforms/${android.compileSdkVersion}/android.jar"
+        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
+        options.links("http://docs.oracle.com/javase/7/docs/api/");
+        options.links("http://d.android.com/reference/");
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
+    }
+}

F-Droid/project.properties

@@ -0,0 +1,12 @@
+target=android-21
+
+android.library.reference.1=../extern/UniversalImageLoader/library
+android.library.reference.2=../extern/MemorizingTrustManager
+android.library.reference.3=../extern/AndroidPinning
+android.library.reference.4=../extern/libsuperuser/libsuperuser
+android.library.reference.5=../extern/zxing-core
+android.library.reference.6=../extern/android-support-v4-preferencefragment
+android.library.reference.7=../extern/Support/v7/appcompat
+
+# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/
+source.dir=src;../extern/symlinks-for-ant-and-eclipse