Upgraded Gradle to 2.10, Android plugin to 2.1.0.

briar-android-tests/build.gradle

@@ -1,6 +1,4 @@
 apply plugin: 'com.android.library'
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
 apply plugin: 'witness'
 apply plugin: 'com.neenbedankt.android-apt'
 
@@ -24,6 +22,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    dexOptions {
+        incremental true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
@@ -46,5 +51,4 @@ dependencyVerification {
             'com.android.support:support-v4:992666398b80724a2f95ea3d7bf7c3d94fb810dcba7ae1aa6e38c0d6120d2603',
             'com.android.support:support-annotations:7f21659b084da073b77b6f7fe7ab250c4f23346238d4efdbbbb937e017ae4693',
     ]
-
 }

briar-android/build.gradle

@@ -11,7 +11,6 @@ repositories {
 }
 
 dependencies {
-
 	def supportVersion = '23.1.1'
 	compile project(':briar-api')
 	compile project(':briar-core')
@@ -35,14 +34,14 @@ dependencies {
 		exclude module: 'support-v4'
 		exclude module: 'recyclerview-v7'
 	}
-	compile ("ch.acra:acra:4.8.5") {
+	compile('ch.acra:acra:4.8.5') {
 		exclude module: 'support-v4'
 		exclude module: 'support-annotations'
 	}
-	compile "info.guardianproject.panic:panic:0.5"
-	compile "info.guardianproject.trustedintents:trustedintents:0.2"
-	compile "de.hdodenhof:circleimageview:2.0.0"
-	compile "com.google.zxing:core:3.2.1"
+	compile 'info.guardianproject.panic:panic:0.5'
+	compile 'info.guardianproject.trustedintents:trustedintents:0.2'
+	compile 'de.hdodenhof:circleimageview:2.0.0'
+	compile 'com.google.zxing:core:3.2.1'
 	apt 'com.google.dagger:dagger-compiler:2.0.2'
 	provided 'javax.annotation:jsr250-api:1.0'
 }
@@ -111,6 +110,9 @@ android {
 	lintOptions {
 		abortOnError false
 	}
+	dexOptions {
+		incremental true
+	}
 }
 
 task downloadTorGeoIp(type: Download) {

briar.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:1.5.0'
+		classpath 'com.android.tools.build:gradle:2.1.0'
 		classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
 		classpath 'de.undercouch:gradle-download-task:2.1.0'
 		classpath files('briar-core/libs/gradle-witness.jar')

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Dec 03 11:56:13 GMT 2015
+#Wed Apr 27 17:31:51 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip