From ec083d617ed0146dffec4c16dc139aba550edbf5 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 12 May 2016 13:36:34 +0100 Subject: [PATCH 1/2] Upgraded Gradle to 2.13, added local Maven repo. --- briar-android-tests/build.gradle | 4 ---- briar-android/build.gradle | 5 ----- briar-api/build.gradle | 4 ---- briar-core/build.gradle | 4 ---- briar-desktop/build.gradle | 4 ---- briar-tests/build.gradle | 4 ---- build.gradle | 15 +++++++++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 13 insertions(+), 31 deletions(-) diff --git a/briar-android-tests/build.gradle b/briar-android-tests/build.gradle index 51ac97f65..af9d13cbb 100644 --- a/briar-android-tests/build.gradle +++ b/briar-android-tests/build.gradle @@ -2,10 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'witness' apply plugin: 'com.neenbedankt.android-apt' -repositories { - maven { url 'http://repo1.maven.org/maven2' } -} - android { compileSdkVersion 23 buildToolsVersion "23.0.3" diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 7b8deefc3..75931e033 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -6,11 +6,6 @@ apply plugin: 'witness' apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'de.undercouch.download' -repositories { - jcenter() - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } -} - dependencies { def supportVersion = '23.2.1' compile project(':briar-api') diff --git a/briar-api/build.gradle b/briar-api/build.gradle index 501c8a130..d38a8b520 100644 --- a/briar-api/build.gradle +++ b/briar-api/build.gradle @@ -4,10 +4,6 @@ targetCompatibility = 1.6 apply plugin: 'witness' -repositories { - jcenter() -} - dependencies { compile "com.google.dagger:dagger:2.0.2" compile 'com.google.dagger:dagger-compiler:2.0.2' diff --git a/briar-core/build.gradle b/briar-core/build.gradle index 7fe4201a7..711a6b656 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -4,10 +4,6 @@ targetCompatibility = 1.6 apply plugin: 'witness' -repositories { - jcenter() -} - dependencies { compile project(':briar-api') compile fileTree(dir: 'libs', include: '*.jar') diff --git a/briar-desktop/build.gradle b/briar-desktop/build.gradle index fb0b7ae7b..56f489dc1 100644 --- a/briar-desktop/build.gradle +++ b/briar-desktop/build.gradle @@ -4,10 +4,6 @@ targetCompatibility = 1.7 apply plugin: 'witness' -repositories { - jcenter() -} - dependencies { compile project(':briar-api') compile fileTree(dir: '../briar-core/libs', include: '*.jar') diff --git a/briar-tests/build.gradle b/briar-tests/build.gradle index 4cc733f8c..fa7ddcd94 100644 --- a/briar-tests/build.gradle +++ b/briar-tests/build.gradle @@ -4,10 +4,6 @@ targetCompatibility = 1.7 apply plugin: 'witness' -repositories { - jcenter() -} - dependencies { compile project(':briar-api') compile project(':briar-core') diff --git a/build.gradle b/build.gradle index c87f49245..7c9f9fba8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,18 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + +allprojects { + repositories { + jcenter() + mavenCentral() + mavenLocal() + } +} + buildscript { repositories { - mavenCentral() - maven { - url "https://plugins.gradle.org/m2/" - } jcenter() + mavenCentral() + mavenLocal() } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db339a244..9c2916648 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 27 17:31:51 BST 2016 +#Thu May 12 13:08:34 BST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip From 7412ca59ac4e5c3c7e51d1aa7c7e7a85adb2f4ee Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 12 May 2016 14:25:00 +0100 Subject: [PATCH 2/2] Looks like we don't need Maven Central. --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7c9f9fba8..816417b2f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ allprojects { repositories { jcenter() - mavenCentral() mavenLocal() } } @@ -11,7 +10,6 @@ allprojects { buildscript { repositories { jcenter() - mavenCentral() mavenLocal() } @@ -21,4 +19,4 @@ buildscript { classpath 'de.undercouch:gradle-download-task:2.1.0' classpath files('briar-core/libs/gradle-witness.jar') } -} \ No newline at end of file +}