aboutsummaryrefslogtreecommitdiff
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle45
1 files changed, 20 insertions, 25 deletions
diff --git a/build.gradle b/build.gradle
index edf156fe..80ac25f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,9 +31,7 @@
apply plugin: 'idea'
-version = '2.0.8'
-
-def jarVersion = version
+version = '2.1.2'
if (!('release' in gradle.startParameter.taskNames)) {
def versionSuffix
@@ -51,12 +49,7 @@ if (!('release' in gradle.startParameter.taskNames)) {
versionSuffix = 'dev'
}
- def baseVersion = version
- version = baseVersion + '-' + versionSuffix
-
- // use something like module-1.2.3-dev.jar for the jar name, rather than the full
- // module-1.2.3-001afe02-dirty.jar
- jarVersion = baseVersion + '-dev'
+ version += "-${versionSuffix}"
} else {
if (System.env.JDK6_HOME == null && !JavaVersion.current().isJava6()) {
throw new InvalidUserDataException("bzzzzzzzt. Release builds must be performed with java 6. " +
@@ -69,6 +62,10 @@ if (!('release' in gradle.startParameter.taskNames)) {
task release() {
}
+task(install) << {
+ println "Installing version: ${version}"
+}
+
// The projects that get pushed to maven
def maven_release_projects = ['smali', 'baksmali', 'dexlib2', 'util']
@@ -100,24 +97,22 @@ subprojects {
version = parent.version
ext {
- depends = [guava: 'com.google.guava:guava:18.0',
- findbugs: 'com.google.code.findbugs:jsr305:1.3.9',
- junit: 'junit:junit:4.6',
- 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: 'de.jflex:jflex:1.4.3',
- jflex_plugin: 'co.tomlee.gradle.plugins:gradle-jflex-plugin:0.0.2',
- proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1',
- dx: 'com.google.android.tools:dx:1.7'
+ depends = [
+ guava: 'com.google.guava:guava:18.0',
+ findbugs: 'com.google.code.findbugs:jsr305:1.3.9',
+ junit: 'junit:junit:4.6',
+ 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: 'de.jflex:jflex:1.4.3',
+ jflex_plugin: 'co.tomlee.gradle.plugins:gradle-jflex-plugin:0.0.2',
+ 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'
]
}
- jar {
- version = jarVersion
- }
-
repositories {
mavenCentral()
}
@@ -202,5 +197,5 @@ buildscript {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.3'
+ gradleVersion = '2.11'
} \ No newline at end of file