From 879a13d097ff369ddf145252492e0843a18c7548 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 28 Dec 2013 13:57:13 +0100
Subject: gradle plugin 0.7.+

--HG--
extra : rebase_source : 1fc756a2ce4e0ea4b3ed5242b1d7a2b81ca3847d
---
 build.gradle | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 73532fbd..b227af89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:0.7.+'
     }
 }
 
@@ -61,6 +61,11 @@ android {
         release
     }
 
+    lintOptions {
+        disable 'MissingTranslation', 'Typos'
+        enable 'IconExpectedSize'
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.release
@@ -80,8 +85,8 @@ if (project.hasProperty('keystoreFile') &&
     android.buildTypes.release.signingConfig = null
 }
 
-//http://stackoverflow.com/questions/16683775/include-so-library-in-apk-in-android-studio
 tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
-    pkgTask.jniDir new File(buildDir, 'native-libs')
+    pkgTask.jniFolders = new HashSet<File>()
+    pkgTask.jniFolders.add(new File(buildDir, 'native-libs'))
 }
 
-- 
cgit v1.2.3