Factor out dependency versions, and upgrade to gradle 14.0

This commit is contained in:
Ben Gruver 2013-03-03 17:58:02 -08:00
parent 60d834f951
commit 46cefa3d5b
6 changed files with 30 additions and 20 deletions

View File

@ -37,10 +37,10 @@ dependencies {
compile project(':util')
compile project(':dexlib')
compile project(':dexlib2')
compile 'commons-cli:commons-cli:1.2'
compile 'com.google.code.findbugs:jsr305:1.3.9'
compile depends.commons_cli
compile depends.guava
proguard 'net.sf.proguard:proguard-base:4.8'
proguard depends.proguard
}
processResources.inputs.property('version', version)

View File

@ -65,6 +65,18 @@ subprojects {
version = parent.version
ext {
depends = [guava: 'com.google.guava:guava:14.0',
findbugs: 'com.google.code.findbugs:jsr305:1.3.9',
junit: 'junit:junit:4.6',
antlr_runtime: 'org.antlr:antlr-runtime:3.2',
antlr: 'org.antlr:antlr:3.2',
commons_cli: 'commons-cli:commons-cli:1.2',
jflex: 'de.jflex:jflex:1.4.3',
proguard: 'net.sf.proguard:proguard-base:4.8'
]
}
jar {
version = jarVersion
}
@ -72,8 +84,6 @@ subprojects {
repositories {
mavenCentral()
}
}
// Note: please don't use this. This is strictly for the official releases

View File

@ -31,6 +31,6 @@
dependencies {
compile project(':util')
compile 'com.google.code.findbugs:jsr305:1.3.9'
compile 'com.google.guava:guava:13.0.1'
compile depends.findbugs
compile depends.guava
}

View File

@ -35,10 +35,10 @@ configurations {
dependencies {
compile project(':util')
compile 'com.google.code.findbugs:jsr305:1.3.9'
compile 'com.google.guava:guava:13.0.1'
compile depends.findbugs
compile depends.guava
testCompile 'junit:junit:4.6'
testCompile depends.junit
accessorTestGenerator project('accessorTestGenerator')
}

View File

@ -67,14 +67,14 @@ idea {
dependencies {
compile project(':util')
compile project(':dexlib')
compile 'org.antlr:antlr-runtime:3.2'
compile 'commons-cli:commons-cli:1.2'
compile depends.antlr_runtime
compile depends.commons_cli
testCompile 'junit:junit:4.6'
testCompile depends.junit
antlr3 'org.antlr:antlr:3.2'
jflex 'de.jflex:jflex:1.4.3'
proguard 'net.sf.proguard:proguard-base:4.8'
antlr3 depends.antlr
jflex depends.jflex
proguard depends.proguard
}
task generateAntlrSource(type: JavaExec) {

View File

@ -30,8 +30,8 @@
*/
dependencies {
compile 'commons-cli:commons-cli:1.2'
compile 'com.google.code.findbugs:jsr305:1.3.9'
compile 'com.google.guava:guava:13.0.1'
testCompile 'junit:junit:4.6'
compile depends.commons_cli
compile depends.findbugs
compile depends.guava
testCompile depends.junit
}