From bf7aab1e117a8e4449162a409d7ff7ab454cda4b Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 4 Nov 2014 13:51:48 +0200
Subject: [PATCH] Updated dependencies, downgrade scala for incremental
 compiles.

---
 app/build.gradle | 14 ++++++++------
 build.gradle     |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1687d1c..9c4944a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,23 +1,23 @@
 apply plugin: 'com.android.application'
-apply plugin: 'android-scala'
+apply plugin: 'jp.leafytree.android-scala'
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.0"
+        classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.2.1"
     }
 }
 
 dependencies {
-    compile "org.scala-lang:scala-library:2.11.2"
+    compile "org.scala-lang:scala-library:2.10.4"
     compile "org.msgpack:msgpack-scala_2.11:0.6.11"
 }
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "19.1.0"
+    buildToolsVersion "21.1.0"
 
     defaultConfig {
         applicationId "com.nutomic.ensichat"
@@ -43,12 +43,12 @@ android {
 
     buildTypes {
         debug {
-            runProguard true
+            minifyEnabled true
             proguardFile file("proguard-rules.pro")
             applicationIdSuffix ".debug"
         }
         release {
-            runProguard true
+            minifyEnabled true
             proguardFile file("proguard-rules.pro")
         }
     }
@@ -57,5 +57,7 @@ android {
     packagingOptions {
         exclude 'decoder.properties'
         exclude 'rootdoc.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
     }
 }
diff --git a/build.gradle b/build.gradle
index 21e4bbf..54ebdb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.3'
+        classpath 'com.android.tools.build:gradle:0.14.1'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files