From 49826fdc563214326a64601f5c93ea3eb2bdb583 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 17 Nov 2017 12:56:33 +0000
Subject: [PATCH] Use new Gradle configurations for Android modules.
---
bramble-android/build.gradle | 6 ++---
briar-android/build.gradle | 46 ++++++++++++++++++------------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle
index 0fdfdf8170..9eae59ea07 100644
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -24,12 +24,12 @@ android {
}
dependencies {
- compile project(path: ':bramble-core', configuration: 'default')
- compile fileTree(dir: 'libs', include: '*.jar')
+ implementation project(path: ':bramble-core', configuration: 'default')
+ implementation fileTree(dir: 'libs', include: '*.jar')
annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
- provided 'javax.annotation:jsr250-api:1.0'
+ compileOnly 'javax.annotation:jsr250-api:1.0'
}
dependencyVerification {
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 94f2d94ec2..3252755afe 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -2,45 +2,45 @@ apply plugin: 'com.android.application'
apply plugin: 'witness'
dependencies {
- compile project(path: ':briar-core', configuration: 'default')
- compile project(path: ':bramble-core', configuration: 'default')
- compile project(path: ':bramble-android', configuration: 'default')
+ implementation project(path: ':briar-core', configuration: 'default')
+ implementation project(path: ':bramble-core', configuration: 'default')
+ implementation project(path: ':bramble-android', configuration: 'default')
def supportVersion = '23.2.1'
- compile "com.android.support:support-v4:$supportVersion"
- compile("com.android.support:appcompat-v7:$supportVersion") {
+ implementation "com.android.support:support-v4:$supportVersion"
+ implementation("com.android.support:appcompat-v7:$supportVersion") {
exclude module: 'support-v4'
}
- compile("com.android.support:preference-v14:$supportVersion") {
+ implementation("com.android.support:preference-v14:$supportVersion") {
exclude module: 'support-v4'
}
- compile("com.android.support:design:$supportVersion") {
+ implementation("com.android.support:design:$supportVersion") {
exclude module: 'support-v4'
exclude module: 'recyclerview-v7'
}
- compile "com.android.support:cardview-v7:$supportVersion"
- compile "com.android.support:support-annotations:$supportVersion"
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile('ch.acra:acra:4.8.5') {
+ implementation "com.android.support:cardview-v7:$supportVersion"
+ implementation "com.android.support:support-annotations:$supportVersion"
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+
+ implementation('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.1.0'
- compile 'com.google.zxing:core:3.3.0'
- compile 'com.jpardogo.materialtabstrip:library:1.1.0'
- compile 'com.github.bumptech.glide:glide:3.8.0'
- compile 'uk.co.samuelwall:material-tap-target-prompt:1.9.2'
+ implementation 'info.guardianproject.panic:panic:0.5'
+ implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
+ implementation 'de.hdodenhof:circleimageview:2.1.0'
+ implementation 'com.google.zxing:core:3.3.0'
+ implementation 'com.jpardogo.materialtabstrip:library:1.1.0'
+ implementation 'com.github.bumptech.glide:glide:3.8.0'
+ implementation 'uk.co.samuelwall:material-tap-target-prompt:1.9.2'
annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
- provided 'javax.annotation:jsr250-api:1.0'
+ compileOnly 'javax.annotation:jsr250-api:1.0'
- testCompile project(path: ':bramble-core', configuration: 'testOutput')
- testCompile 'org.robolectric:robolectric:3.5.1'
- testCompile 'org.robolectric:shadows-support-v4:3.0'
+ testImplementation project(path: ':bramble-core', configuration: 'testOutput')
+ testImplementation 'org.robolectric:robolectric:3.5.1'
+ testImplementation 'org.robolectric:shadows-support-v4:3.0'
testCompile 'org.mockito:mockito-core:2.8.9'
}
--
GitLab