From 4adf2cfbbd9e3a00d6c8b70a730bd195f3fd872b Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Fri, 4 Jul 2014 21:14:14 +0200
Subject: [PATCH] Updated project to new Android Build Tools.

---
 build.gradle           | 18 ++++++++++--------
 kdeconnect-android.iml | 16 ----------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index c56d6b19..4180a506 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,16 +3,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.11.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.1.0"
-
+    buildToolsVersion '20.0.0'
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 19
@@ -27,16 +26,19 @@ android {
     lintOptions {
         abortOnError false
     }
-
+    productFlavors {
+    }
+    buildTypes {
+    }
 }
 
 dependencies {
     repositories {
         mavenCentral()
     }
-    compile "com.android.support:support-v4:19.1.+"
-    compile "com.android.support:appcompat-v7:19.1.+"
-    compile "org.apache.mina:mina-core:2.0.+"
+    compile 'com.android.support:support-v4:19.1.+'
+    compile 'com.android.support:appcompat-v7:19.1.+'
+    compile 'org.apache.mina:mina-core:2.0.+'
     compile 'org.bouncycastle:bcprov-jdk16:1.45'
     compile 'org.apache.sshd:sshd-core:0.8.0'
     compile 'tomcat:tomcat-apr:5.5.+'
diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml
index 180c4bea..bd185dd2 100644
--- a/kdeconnect-android.iml
+++ b/kdeconnect-android.iml
@@ -56,24 +56,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/exploded-aar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/lint-results-release-fatal_files" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/source" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />