From fec3593a739a5d9efe3c78768ffdaf2233615e65 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Tue, 9 Feb 2016 12:00:14 +0100
Subject: [PATCH] Fixed build.gradle

Refs #298
---
 app/app.iml      | 11 +++++++
 app/build.gradle | 85 ++++++++++++++++++++++++++----------------------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 7e968b56..9449018a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -87,16 +87,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/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/objectFiles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/build.gradle b/app/build.gradle
index 2af520a1..f57d4c59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,56 +5,65 @@ model {
         compileSdkVersion = 23
         buildToolsVersion = "23.0.2"
 
-        defaultConfig.with {
-            applicationId = "eu.faircode.netguard"
-            minSdkVersion.apiLevel = 14
-            targetSdkVersion.apiLevel = 23
+        defaultConfig {
+            applicationId "eu.faircode.netguard"
+            minSdkVersion.apiLevel 14
+            targetSdkVersion.apiLevel 23
             versionCode = 2016020901
             versionName = "0.86-beta"
             archivesBaseName = "NetGuard-v$versionName-$versionCode"
-        }
-    }
-    android.ndk {
-        platformVersion = "14"
-        moduleName = "netguard"
-        toolchain = "clang"
-        ldLibs.add("log")
-    }
-    android.sources {
-        main {
-            jni {
-                source {
-                    srcDir "src/main/jni/netguard"
-                }
-                exportedHeaders {
+
+            buildConfigFields {
+                create() {
+                    type "int"
+                    name "VALUE"
+                    value "1"
                 }
             }
         }
-    }
-    android.buildTypes {
-        release {
-            minifyEnabled = true
-            useProguard = true
-            proguardFiles.add(file('proguard-rules.pro'))
-            // TODO remove on stable release
-            ndk.with {
-                debuggable = true
+
+        ndk {
+            platformVersion = "14"
+            moduleName = "netguard"
+            toolchain = "clang"
+            ldLibs.add("log")
+        }
+
+        sources {
+            main {
+                jni {
+                    source {
+                        srcDir "src/main/jni/netguard"
+                    }
+                    exportedHeaders {
+                    }
+                }
             }
         }
-        debug {
-            ndk.with {
-                useProguard = false
-                debuggable = true
+
+        buildTypes {
+            release {
+                minifyEnabled true
+                useProguard = true
+                proguardFiles.add(file('proguard-rules.pro'))
+                // TODO remove on stable release
+                ndk {
+                    debuggable true
+                }
+            }
+            debug {
+                useProguard false
+                ndk {
+                    debuggable true
+                }
             }
         }
-    }
-    android.productFlavors {
-        create("all") {
+
+        productFlavors {
+            create("all") {
+            }
         }
     }
-    android.lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {