Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Upgraded Gradle to 2.10, Android plugin to 2.1.0.

Browse Source
This commit is contained in:
akwizgran
2016-04-27 18:03:00 +01:00
parent 4464a66463
commit efd9976ade
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android-tests/build.gradle
View File

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

14
briar-android/build.gradle
View File

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

2
briar.iml
View File

@@ -8,7 +8,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </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 /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />

2
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { 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 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'de.undercouch:gradle-download-task:2.1.0' classpath 'de.undercouch:gradle-download-task:2.1.0'
classpath files('briar-core/libs/gradle-witness.jar') classpath files('briar-core/libs/gradle-witness.jar')

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Dec 03 11:56:13 GMT 2015 #Wed Apr 27 17:31:51 BST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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