Clean up the jar naming

The previous naming was interfering with 'gr install' installing the
artifacts locally.

3 files changed, 9 insertions, 22 deletions

diff --git a/baksmali/build.gradle b/baksmali/build.gradle
index 4780cd76..f3a14b19 100644
--- a/baksmali/build.gradle
+++ b/baksmali/build.gradle
@@ -51,16 +51,13 @@ dependencies {
 processResources.inputs.property('version', version)
 processResources.expand('version': version)
 
-// This is the jar that gets uploaded to maven
-jar {
-    baseName = 'maven'
-}
-
 // Build a separate jar that contains all dependencies
 task fatJar(type: Jar) {
     from sourceSets.main.output
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 
+    classifier = 'fat'
+
     manifest {
         attributes('Main-Class': 'org.jf.baksmali.main')
     }
diff --git a/build.gradle b/build.gradle
index fc03985b..fb3173cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,6 @@ apply plugin: 'idea'
 
 version = '2.1.2'
 
-def jarVersion = version
-
 if (!('release' in gradle.startParameter.taskNames)) {
     def versionSuffix
     try {
@@ -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']
 
@@ -114,10 +111,6 @@ subprojects {
          ]
     }
 
-    jar {
-        version = jarVersion
-    }
-
     repositories {
         mavenCentral()
     }
diff --git a/smali/build.gradle b/smali/build.gradle
index 5679c715..75001d73 100644
--- a/smali/build.gradle
+++ b/smali/build.gradle
@@ -92,16 +92,13 @@ dependencies {
 processResources.inputs.property('version', version)
 processResources.expand('version': version)
 
-// This is the jar that gets uploaded to maven
-jar {
-    baseName = 'maven'
-}
-
 // Build a separate jar that contains all dependencies
 task fatJar(type: Jar, dependsOn: jar) {
     from sourceSets.main.output
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 
+    classifier = 'fat'
+
     manifest {
         attributes('Main-Class': 'org.jf.smali.main')
     }