From 974f4c9b73a42ff1e2348f6f14919e98881f7e55 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 23 Jun 2016 11:22:03 +0200 Subject: [PATCH] Updated build tools --- README.md | 2 +- app/app.iml | 36 ++++++++++++++++++------------------ app/build.gradle | 6 +++--- gradle.properties | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b9e146b1..026512be 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ Contributing Building is simple, if you install the right tools: * [Android Studio 2.1](http://developer.android.com/sdk/) -* [Android NDK r11](http://developer.android.com/tools/sdk/ndk/) +* [Android NDK r12](http://developer.android.com/tools/sdk/ndk/) The native code is built as part of the Android Studio project. diff --git a/app/app.iml b/app/app.iml index b2b54ca8..549f1d14 100644 --- a/app/app.iml +++ b/app/app.iml @@ -42,6 +42,12 @@ + + + + + + @@ -50,12 +56,6 @@ - - - - - - @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + @@ -147,14 +147,14 @@ - + - - + + + - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1eab9cf7..7a908583 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.model.application' model { android { - compileSdkVersion = 23 // "android-N" - buildToolsVersion = "23.0.3" // "24.0.0 rc2" + compileSdkVersion = 24 + buildToolsVersion = "24" defaultConfig { applicationId = "eu.faircode.netguard" minSdkVersion.apiLevel = 14 - targetSdkVersion.apiLevel = 23 // 24 + targetSdkVersion.apiLevel = 23 versionCode = 2016051401 versionName = "2.25" archivesBaseName = "NetGuard-v$versionName-$versionCode-sdk-$targetSdkVersion.apiLevel" diff --git a/gradle.properties b/gradle.properties index 1d3591c8..89e0d99e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true