Configuração para gerar snapshot e release.

alexandreant · Dec 17, 2014 · 4c5eda8 · 4c5eda8
1 parent 9712896
commit 4c5eda8
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 37 deletions.
diff --git a/brut.apktool.smali/build.gradle b/brut.apktool.smali/build.gradle
@@ -37,27 +37,29 @@ version = '2.0.3'
 def jarVersion = version
 
 if (!('release' in gradle.startParameter.taskNames)) {
-    def versionSuffix
-    try {
-        def git = org.eclipse.jgit.api.Git.open(file('../.'))
-        def head = git.getRepository().getRef("HEAD")
-        versionSuffix = head.getObjectId().abbreviate(8).name()
+//    def versionSuffix
+//    try {
+//        def git = org.eclipse.jgit.api.Git.open(file('../.'))
+//        def head = git.getRepository().getRef("HEAD")
+//        versionSuffix = head.getObjectId().abbreviate(8).name()
+//
+//        if (!git.status().call().clean) {
+//            versionSuffix += '-dirty'
+//        }
+//    } catch (Exception) {
+//        // In case we can't get the commit for some reason,
+//        // just use -dev
+//        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'
 
-        if (!git.status().call().clean) {
-            versionSuffix += '-dirty'
-        }
-    } catch (Exception) {
-        // In case we can't get the commit for some reason,
-        // just use -dev
-        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 = jarVersion + "-SNAPSHOT"
 }
 
 subprojects {

diff --git a/brut.apktool/apktool-lib/build.gradle b/brut.apktool/apktool-lib/build.gradle
@@ -18,7 +18,6 @@ import org.apache.tools.ant.filters.*
 apply plugin: "maven"
 
 group = "brut.apktool"
-version = "2.0.0-RC2"
 
 processResources {
   from('src/main/resources/properties') {

diff --git a/brut.j.common/build.gradle b/brut.j.common/build.gradle
@@ -15,7 +15,6 @@
  */
 
 group = "brut.j.common"
-version = "2.0.0-RC2"
 
 dependencies {
     testCompile depends.junit

diff --git a/brut.j.dir/build.gradle b/brut.j.dir/build.gradle
@@ -15,7 +15,6 @@
  */
 
 group = "brut.j.dir"
-version = "2.0.0-RC2"
 
 dependencies {
   compile project(':brut.j.common'),

diff --git a/brut.j.util/build.gradle b/brut.j.util/build.gradle
@@ -15,7 +15,6 @@
  */
 
 group = "brut.j.util"
-version = "2.0.0-RC2"
 
 dependencies {
   compile project(':brut.j.common'),

diff --git a/build.gradle b/build.gradle
@@ -28,17 +28,17 @@ allprojects {
 }
 
 if (!('release' in gradle.startParameter.taskNames)) {
-    def hash = getCheckedOutGitCommitHash();
-
-    if (hash == null) {
-        project.ext.set("hash", "dirty")
-        project.ext.set("apktool_version", apktoolversion_major + "-dirty")
-        println "Building SNAPSHOT (no .git folder found)";
-    } else {
-        project.ext.set("hash", hash);
-        project.ext.set("apktool_version", apktoolversion_major + "-" + hash + "-SNAPSHOT");
-        println "Building SNAPSHOT (" + getCheckedOutBranch() + "): " + hash;
-    }
+//    def hash = getCheckedOutGitCommitHash();
+
+//    if (hash == null) {
+//        project.ext.set("hash", "dirty")
+//        project.ext.set("apktool_version", apktoolversion_major + "-dirty")
+//        println "Building SNAPSHOT (no .git folder found)";
+//    } else {
+        project.ext.set("hash", "SNAPSHOT");
+        project.ext.set("apktool_version", apktoolversion_major + "-" + apktoolversion_minor + "-SNAPSHOT");
+        println "Building SNAPSHOT (" + getCheckedOutBranch() + "): " + apktoolversion_major + "-" + apktoolversion_minor + "-SNAPSHOT";
+//    }
 } else {
     project.ext.set("hash", "")
     project.ext.set("apktool_version", apktoolversion_major + "-" + apktoolversion_minor);
@@ -84,6 +84,8 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'idea'
 
+    version = project.apktool_version
+
     ext {
         depends = [
                 antlr: 'org.antlr:antlr:3.5',

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 23 07:11:01 CDT 2014
+#Tue Dec 16 18:19:29 BRST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip