From 8a934b4a6816ea2c9bb1362b6c3527a761000da6 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Sat, 5 Aug 2017 12:26:04 +0200
Subject: [PATCH] Lower gradle version so F-Droid can build it ==== detail
 begin ==== Available gradle versions: 4.0 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0
 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1
 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4 Found 4.0.2 via distributionUrl
 /opt/gradle/bin/gradle: line 9: /opt/gradle/versions/4.0.2/bin/gradle: No
 such file or directory ==== detail end ====

---
 app/build.gradle                         | 20 +++++++-------------
 build.gradle                             |  6 ++++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index de4c0dee..6bf766a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,14 +4,14 @@ ext {
     version_sdk = [
         compileSdk : 26,
         buildTools : "26.0.1",
-        minSdk     : 17
+        minSdk     : 17,
         //targetSdk: compileSdk,
     ]
     version_sdk.targetSdk = version_sdk.compileSdk
     version_lib = [
         appcompat   : "26.0.0",
         butterknife : "8.7.0",
-        netcipher   : "2.0.0-alpha1"
+        netcipher   : "2.0.0-alpha1",
     ]
 }
 
@@ -24,7 +24,7 @@ android {
         targetSdkVersion version_sdk.targetSdk
 
         versionCode 22
-        versionName "1.0.2-dev"
+        versionName "1.0.2"
 
         applicationId "com.github.dfa.diaspora_android"
         resValue 'string', 'app_name', "dandelion*"
@@ -66,14 +66,6 @@ android {
     }
 }
 
-// Additional repositories
-repositories {
-    google()
-    maven {
-        url "https://jitpack.io"
-    }
-}
-
 dependencies {
     // Sub-Projects
     //compile project(':subprojectFromRoot')
@@ -89,11 +81,13 @@ dependencies {
     compile "com.android.support:customtabs:${version_lib.appcompat}"
     compile "com.android.support:cardview-v7:${version_lib.appcompat}"
 
-    // More libraries
+    // UI libraries
+    compile "com.github.DASAR:ShiftColorPicker:v0.5"
+
+    // Tool libraries
     compile "com.jakewharton:butterknife:${version_lib.butterknife}"
     compile "info.guardianproject.netcipher:netcipher:${version_lib.netcipher}"
     compile "info.guardianproject.netcipher:netcipher-webkit:${version_lib.netcipher}"
-    compile "com.github.DASAR:ShiftColorPicker:v0.5"
 
     annotationProcessor "com.jakewharton:butterknife-compiler:${version_lib.butterknife}"
 }
diff --git a/build.gradle b/build.gradle
index 657098a8..a245ff8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,7 +16,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         mavenCentral()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f1b5a66f..e1c97c07 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip