From 6f7f8b40e3f18c93237eda310202146f5d17d64d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 17 Oct 2017 15:31:28 +0100
Subject: [PATCH] Upgraded Gradle plugin and build tools.
---
bramble-android/build.gradle | 4 ++--
bramble-core/build.gradle | 2 +-
bramble-j2se/build.gradle | 2 +-
briar-android/build.gradle | 6 +++---
briar-api/build.gradle | 2 +-
briar-core/build.gradle | 4 ++--
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle
index 80ec56e00f..b372cf7f3d 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 9ffe8580ac..dfe194a316 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 e7e029e01b..5b3cf67866 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 b2bb0f0cf9..d31f16b1f8 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 f3f2257c0d..2c957a6452 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 3674306c13..8976d7e3a5 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 4ac3a97dc5..af816d45f5 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 94e2d5468b..37e677adb7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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
--
GitLab