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

Upgraded Gradle plugin and build tools.

Browse Source
This commit is contained in:
akwizgran
2017-10-17 15:31:28 +01:00
parent 1a83b2c99b
commit 6f7f8b40e3
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bramble-android/build.gradle
View File

@@ -7,7 +7,7 @@ apply plugin: 'de.undercouch.download'
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion '25.0.0'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
@@ -24,7 +24,7 @@ android {
} }
dependencies { dependencies {
compile project(':bramble-core') compile project(path: ':bramble-core', configuration: 'default')
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
provided 'javax.annotation:jsr250-api:1.0' provided 'javax.annotation:jsr250-api:1.0'
} }

2
bramble-core/build.gradle
View File

@@ -10,7 +10,7 @@ targetCompatibility = 1.6
apply plugin: 'witness' apply plugin: 'witness'
dependencies { dependencies {
compile project(':bramble-api') compile project(path: ':bramble-api', configuration: 'default')
compile 'com.madgag.spongycastle:core:1.58.0.0' compile 'com.madgag.spongycastle:core:1.58.0.0'
compile 'com.h2database:h2:1.4.192' // This is the last version that supports Java 1.6 compile 'com.h2database:h2:1.4.192' // This is the last version that supports Java 1.6
compile 'org.bitlet:weupnp:0.1.4' compile 'org.bitlet:weupnp:0.1.4'

2
bramble-j2se/build.gradle
View File

@@ -5,7 +5,7 @@ targetCompatibility = 1.7
apply plugin: 'witness' apply plugin: 'witness'
dependencies { dependencies {
compile project(':bramble-core') compile project(path: ':bramble-core', configuration: 'default')
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
compile 'net.java.dev.jna:jna:4.4.0' compile 'net.java.dev.jna:jna:4.4.0'
compile 'net.java.dev.jna:jna-platform:4.4.0' compile 'net.java.dev.jna:jna-platform:4.4.0'

6
briar-android/build.gradle
View File

@@ -3,8 +3,8 @@ apply plugin: 'witness'
dependencies { dependencies {
def supportVersion = '23.2.1' def supportVersion = '23.2.1'
compile project(':briar-core') compile project(path: ':briar-core', configuration: 'default')
compile project(':bramble-android') compile project(path: ':bramble-android', configuration: 'default')
compile "com.android.support:support-v4:$supportVersion" compile "com.android.support:support-v4:$supportVersion"
compile("com.android.support:appcompat-v7:$supportVersion") { compile("com.android.support:appcompat-v7:$supportVersion") {
exclude module: 'support-v4' exclude module: 'support-v4'
@@ -73,7 +73,7 @@ def getGitHash = { ->
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion '25.0.0'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14

2
briar-api/build.gradle
View File

@@ -5,5 +5,5 @@ targetCompatibility = 1.6
apply plugin: 'witness' apply plugin: 'witness'
dependencies { dependencies {
compile project(':bramble-api') compile project(path: ':bramble-api', configuration: 'default')
} }

4
briar-core/build.gradle
View File

@@ -10,13 +10,13 @@ targetCompatibility = 1.6
apply plugin: 'witness' apply plugin: 'witness'
dependencies { dependencies {
compile project(':briar-api') compile project(path: ':briar-api', configuration: 'default')
compile 'com.rometools:rome:1.7.3' compile 'com.rometools:rome:1.7.3'
compile 'org.jdom:jdom2:2.0.6' compile 'org.jdom:jdom2:2.0.6'
compile 'com.squareup.okhttp3:okhttp:3.8.0' compile 'com.squareup.okhttp3:okhttp:3.8.0'
compile 'org.jsoup:jsoup:1.10.3' compile 'org.jsoup:jsoup:1.10.3'
testCompile project(':bramble-core') testCompile project(path: ':bramble-core', configuration: 'default')
testCompile project(path: ':bramble-core', configuration: 'testOutput') testCompile project(path: ':bramble-core', configuration: 'testOutput')
testCompile project(path: ':bramble-api', configuration: 'testOutput') testCompile project(path: ':bramble-api', configuration: 'testOutput')
testCompile 'net.jodah:concurrentunit:0.4.2' testCompile 'net.jodah:concurrentunit:0.4.2'

2
build.gradle
View File

@@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'de.undercouch:gradle-download-task:3.2.0' classpath 'de.undercouch:gradle-download-task:3.2.0'
classpath files('libs/gradle-witness.jar') classpath files('libs/gradle-witness.jar')

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

@@ -3,4 +3,4 @@ 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.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip