mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-21 07:09:56 +01:00
Upgrade Gradle and Android Gradle plugin
This commit is contained in:
@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
|
||||
apply plugin: 'witness'
|
||||
|
||||
dependencies {
|
||||
def supportVersion = '23.2.1'
|
||||
compile project(path: ':briar-core', configuration: 'default')
|
||||
compile project(path: ':bramble-core', configuration: 'default')
|
||||
compile 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") {
|
||||
exclude module: 'support-v4'
|
||||
@@ -22,6 +24,7 @@ dependencies {
|
||||
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'
|
||||
@@ -35,7 +38,7 @@ dependencies {
|
||||
provided 'javax.annotation:jsr250-api:1.0'
|
||||
|
||||
testCompile project(path: ':bramble-core', configuration: 'testOutput')
|
||||
testCompile 'org.robolectric:robolectric:3.0'
|
||||
testCompile 'org.robolectric:robolectric:3.5.1'
|
||||
testCompile 'org.mockito:mockito-core:2.8.9'
|
||||
}
|
||||
|
||||
@@ -74,8 +77,8 @@ def getGitHash = { ->
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion '25.0.0'
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion '26.0.2'
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 14
|
||||
@@ -109,6 +112,12 @@ android {
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
}
|
||||
|
||||
testOptions {
|
||||
unitTests {
|
||||
includeAndroidResources = true
|
||||
}
|
||||
}
|
||||
|
||||
aaptOptions {
|
||||
cruncherEnabled = false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user