From ebf183aedaa342203a6977a5290323d2f27ce7a7 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 3 Feb 2016 14:03:09 -0600
Subject: [PATCH] Update to Gradle 2.10 and the newest experimental plugin--
 Fixes building on F-Droid

---
 app/app.iml                              |  2 ++
 app/build.gradle                         | 11 +++++++----
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 08982d4..59cbdff 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -74,12 +74,14 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.journeyapps/zxing-android-embedded/3.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.sonelli/juicessh-pluginlibrary/1.0.13/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
diff --git a/app/build.gradle b/app/build.gradle
index de39cab..5cbe265 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,10 +10,7 @@ model {
         compileSdkVersion = 23
         buildToolsVersion = '23.0.2'
         packagingOptions.excludes = ['META-INF/DEPENDENCIES.txt','META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
-        sources.main {
-            jni.source.srcDirs = ['src/main/jni']
-            jniLibs.source.srcDirs = ['src/main/jni/libfko']
-        }
+
         defaultConfig.with {
             applicationId = "org.cipherdyne.fwknop2"
             minSdkVersion.apiLevel = 15
@@ -22,6 +19,12 @@ model {
             versionName = "1.2.1"
         }
     }
+    android.sources {
+        main {
+            jni.source.srcDirs = ['src/main/jni']
+            jniLibs.source.srcDirs = ['src/main/jni/libfko']
+        }
+    }
     android.buildTypes {
         release {
             minifyEnabled = false
diff --git a/build.gradle b/build.gradle
index f108728..2d90b04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha5'
         classpath 'org.ajoberstar:gradle-git:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 444bd7e..f4764e0 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-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip