diff options
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 56aaa3f6..9e8205d4 100644 --- a/build.gradle +++ b/build.gradle @@ -31,9 +31,14 @@ apply plugin: 'idea' -version = '2.1.3' +version = '2.2.0' +def jcommanderVersion = '' if (!('release' in gradle.startParameter.taskNames)) { + // we compile against 1.48 normally, to match what's in AOSP, but switch to a newer version + // for release, because it has some fixes required when running on Android + jcommanderVersion = 'com.beust:jcommander:1.48' + def versionSuffix try { def git = org.eclipse.jgit.api.Git.open(file('.')) @@ -51,6 +56,8 @@ if (!('release' in gradle.startParameter.taskNames)) { version += "-${versionSuffix}" } else { + jcommanderVersion = 'com.beust:jcommander:1.64' + if (System.env.JDK6_HOME == null && !JavaVersion.current().isJava6()) { throw new InvalidUserDataException("bzzzzzzzt. Release builds must be performed with java 6. " + "Either run gradle with java 6, or define the JDK6_HOME environment variable.") @@ -101,15 +108,16 @@ subprojects { guava: 'com.google.guava:guava:18.0', findbugs: 'com.google.code.findbugs:jsr305:1.3.9', junit: 'junit:junit:4.6', + mockito: 'org.mockito:mockito-core:1.10.19', antlr_runtime: 'org.antlr:antlr-runtime:3.5.2', antlr: 'org.antlr:antlr:3.5.2', stringtemplate: 'org.antlr:stringtemplate:3.2.1', - commons_cli: 'commons-cli:commons-cli:1.2', jflex_plugin: 'org.xbib.gradle.plugin:gradle-plugin-jflex:1.1.0', proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1', dx: 'com.google.android.tools:dx:1.7', - gson: 'com.google.code.gson:gson:2.3.1' - ] + gson: 'com.google.code.gson:gson:2.3.1', + jcommander: jcommanderVersion + ] } repositories { @@ -196,5 +204,6 @@ buildscript { } task wrapper(type: Wrapper) { - gradleVersion = '2.14' + gradleVersion = '3.1' + distributionType = Wrapper.DistributionType.ALL }
\ No newline at end of file |