diff --git a/app/app.iml b/app/app.iml
index c85fa8e0..f3f4900c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -36,34 +36,34 @@
-
+
-
+
-
+
-
+
-
+
@@ -75,6 +75,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 39944dae..d2fc743e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,34 +1,24 @@
-apply plugin: 'com.android.application'
+apply plugin: 'com.android.model.application'
-android {
- compileSdkVersion 23
- buildToolsVersion "23.0.2"
+model {
+ android {
+ compileSdkVersion = 23
+ buildToolsVersion = "23.0.2"
- defaultConfig {
- applicationId "eu.faircode.netguard"
- minSdkVersion 21
- targetSdkVersion 23
- versionCode 38
- versionName "0.38"
- }
- buildTypes {
- release {
- minifyEnabled true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- applicationVariants.all { variant ->
- setOutputFile(variant, defaultConfig)
- }
+ defaultConfig.with {
+ applicationId = "eu.faircode.netguard"
+ minSdkVersion.apiLevel = 21
+ targetSdkVersion.apiLevel = 23
+ versionCode = 38
+ versionName = "0.38"
+ archivesBaseName = "NetGuard-v$versionName"
}
}
-}
-
-def setOutputFile(variant, defaultConfig) {
- variant.outputs.each { output ->
- def fileName = "NetGuard-v" + defaultConfig.versionName + ".apk"
- if (output.zipAlign)
- output.outputFile = new File(output.outputFile.parent, fileName)
- else
- output.packageApplication.outputFile = new File(output.packageApplication.outputFile.parent, fileName)
+ android.buildTypes {
+ release {
+ isMinifyEnabled = true
+ proguardFiles += file('proguard-rules.pro')
+ }
}
}
diff --git a/build.gradle b/build.gradle
index 2761da45..d080408d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.tools.build:gradle-experimental:0.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1824792b..9373941d 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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip