From efd9976ade05bc8f786350bdd0e1f1b5c362a7a0 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 27 Apr 2016 18:03:00 +0100
Subject: [PATCH] Upgraded Gradle to 2.10, Android plugin to 2.1.0.
---
briar-android-tests/build.gradle | 10 +++++++---
briar-android/build.gradle | 14 ++++++++------
briar.iml | 2 +-
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/briar-android-tests/build.gradle b/briar-android-tests/build.gradle
index df83aad487..3bebf3fd96 100644
--- a/briar-android-tests/build.gradle
+++ b/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',
]
-
}
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index c933f1358c..fa4d73f2ab 100644
--- a/briar-android/build.gradle
+++ b/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) {
diff --git a/briar.iml b/briar.iml
index 16216bfa20..f2d23be9ad 100644
--- a/briar.iml
+++ b/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" />
diff --git a/build.gradle b/build.gradle
index 8b5763eb94..c87f49245d 100644
--- a/build.gradle
+++ b/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')
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cde3d80747..db339a2449 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
--
GitLab