Updated dependencies.

app/build.gradle

@@ -6,46 +6,36 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.3.2"
+        classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.4"
     }
 }
 
 dependencies {
-    compile "com.android.support:support-v4:21.0.3"
+    compile "com.android.support:support-v4:22.0.0"
-    // For `flat` debug config, as `flatProvided` is unknown.
+    compile 'com.android.support:multidex:1.0.1'
-    provided "org.scala-lang:scala-library:2.11.6"
+    androidTestCompile "com.android.support:multidex-instrumentation:1.0.1", { exclude module: "multidex" }
-    debugCompile "org.scala-lang:scala-library:2.11.6"
+    compile "org.scala-lang:scala-library:2.11.6"
-    releaseCompile "org.scala-lang:scala-library:2.11.6"
     compile 'com.google.guava:guava:18.0'
 }
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         applicationId "com.nutomic.ensichat"
-        minSdkVersion 15
+        targetSdkVersion 22
-        targetSdkVersion 21
         versionCode 3
         versionName "0.1.2"
-    }
+        multiDexEnabled true
-
+        testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
-    sourceSets {
-        main.scala.srcDir "src/main/scala"
-        androidTest.scala.srcDir "src/androidTest/scala"
     }
 
     buildTypes {
-        thin {
-            applicationIdSuffix ".debug"
-            minifyEnabled false
-            signingConfig signingConfigs.debug
-        }
         debug {
             applicationIdSuffix ".debug"
-            minifyEnabled true
+            minifyEnabled false
-            proguardFile file("proguard-rules.pro")
+            testCoverageEnabled true
         }
         release {
             minifyEnabled true
@@ -53,15 +43,10 @@ android {
         }
     }
 
-    // Needed to rename `app-thin.apk` to `app-debug.apk` (because Android Studio doesn't let us
+    productFlavors {
-    // specify a different apk name).
+        dev.minSdkVersion 19 // TODO: Change to 21 to reduce compilation time
-/*
+        rel.minSdkVersion 15
-    applicationVariants.all { variant ->
-        def apk = variant.outputFile;
-        def newName = apk.name.replace("app-thin", "app-debug");
-        variant.outputFile = new File(apk.parentFile, newName);
     }
-*/
 
     // Avoid duplicate file errors during packaging.
     packagingOptions {

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-feature android:name="android.hardware.bluetooth" android:required="true" />
 
     <application
+        android:name="android.support.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

app/src/thin/AndroidManifest.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.nutomic.ensichat">
-
-    <application>
-
-        <uses-library android:name="s1" />
-        <uses-library android:name="s2" />
-        <uses-library android:name="s3" />
-
-    </application>
-
-</manifest>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.8'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip