diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 80ec56e00fc4d4bbe431179afa2b221902c1f284..b372cf7f3d8d4a9fb88c16f41dc1aa2729e748c2 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion '25.0.0' defaultConfig { minSdkVersion 14 @@ -24,7 +24,7 @@ android { } dependencies { - compile project(':bramble-core') + compile project(path: ':bramble-core', configuration: 'default') compile fileTree(dir: 'libs', include: '*.jar') provided 'javax.annotation:jsr250-api:1.0' } diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle index 9ffe8580ac0d8c91cc979615261aed0adb05cdba..dfe194a316e57651fe2f2717243a28609558927c 100644 --- a/bramble-core/build.gradle +++ b/bramble-core/build.gradle @@ -10,7 +10,7 @@ targetCompatibility = 1.6 apply plugin: 'witness' dependencies { - compile project(':bramble-api') + compile project(path: ':bramble-api', configuration: 'default') 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 'org.bitlet:weupnp:0.1.4' diff --git a/bramble-j2se/build.gradle b/bramble-j2se/build.gradle index e7e029e01ba18a9165118f70be3a42e91da61e95..5b3cf67866c1cee49fdd14b8045e92a23642a119 100644 --- a/bramble-j2se/build.gradle +++ b/bramble-j2se/build.gradle @@ -5,7 +5,7 @@ targetCompatibility = 1.7 apply plugin: 'witness' dependencies { - compile project(':bramble-core') + compile project(path: ':bramble-core', configuration: 'default') compile fileTree(dir: 'libs', include: '*.jar') compile 'net.java.dev.jna:jna:4.4.0' compile 'net.java.dev.jna:jna-platform:4.4.0' diff --git a/briar-android/build.gradle b/briar-android/build.gradle index b2bb0f0cf992f05aa7cd2faaac7e42e290a97188..d31f16b1f89843aaf98db3437c91e30cdc2728f3 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'witness' dependencies { def supportVersion = '23.2.1' - compile project(':briar-core') - compile project(':bramble-android') + compile project(path: ':briar-core', configuration: 'default') + compile project(path: ':bramble-android', configuration: 'default') compile "com.android.support:support-v4:$supportVersion" compile("com.android.support:appcompat-v7:$supportVersion") { exclude module: 'support-v4' @@ -73,7 +73,7 @@ def getGitHash = { -> android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion '25.0.0' defaultConfig { minSdkVersion 14 diff --git a/briar-api/build.gradle b/briar-api/build.gradle index f3f2257c0d960623647ba090938d3606d3550cde..2c957a64520e5707072beb2326d6d4e6239a2624 100644 --- a/briar-api/build.gradle +++ b/briar-api/build.gradle @@ -5,5 +5,5 @@ targetCompatibility = 1.6 apply plugin: 'witness' dependencies { - compile project(':bramble-api') + compile project(path: ':bramble-api', configuration: 'default') } diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 3674306c132f3a1d35da901f4d05f06fa81a0a4f..8976d7e3a5694c7a0b0ae693baea003cb94522db 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -10,13 +10,13 @@ targetCompatibility = 1.6 apply plugin: 'witness' dependencies { - compile project(':briar-api') + compile project(path: ':briar-api', configuration: 'default') compile 'com.rometools:rome:1.7.3' compile 'org.jdom:jdom2:2.0.6' compile 'com.squareup.okhttp3:okhttp:3.8.0' 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-api', configuration: 'testOutput') testCompile 'net.jodah:concurrentunit:0.4.2' diff --git a/build.gradle b/build.gradle index 4ac3a97dc539d8abf9e43916c9c6886b006233df..af816d45f5df1ef741390436724c737c487395ca 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { } 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 'de.undercouch:gradle-download-task:3.2.0' classpath files('libs/gradle-witness.jar') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94e2d5468b0ba3b7d95b5b0634b56bb4231f7c10..c45ed17199ec988ff858f9b2054eee524b46f655 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 +distributionSha256Sum=71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7