Merge branch 'gradle-upgrade' into 'master'

Upgrade Gradle to 2.13, add local Maven repo



See merge request !186
This commit is contained in:
Ernir Erlingsson
2016-05-14 19:22:42 +00:00
8 changed files with 12 additions and 32 deletions

View File

@@ -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"

View File

@@ -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')

View File

@@ -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'

View File

@@ -4,10 +4,6 @@ targetCompatibility = 1.6
apply plugin: 'witness'
repositories {
jcenter()
}
dependencies {
compile project(':briar-api')
compile fileTree(dir: 'libs', include: '*.jar')

View File

@@ -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')

View File

@@ -4,10 +4,6 @@ targetCompatibility = 1.7
apply plugin: 'witness'
repositories {
jcenter()
}
dependencies {
compile project(':briar-api')
compile project(':briar-core')

View File

@@ -1,11 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
allprojects {
repositories {
jcenter()
mavenLocal()
}
}
buildscript {
repositories {
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
jcenter()
mavenLocal()
}
dependencies {
@@ -14,4 +19,4 @@ buildscript {
classpath 'de.undercouch:gradle-download-task:2.1.0'
classpath files('briar-core/libs/gradle-witness.jar')
}
}
}

View File

@@ -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