updating gitignore, adding wrapper.jar

This commit is contained in:
Connor Tumbleson 2012-09-19 20:39:03 -05:00
parent 4db49ab347
commit 7e6ad41830
4 changed files with 33 additions and 31 deletions

16
.gitignore vendored
View File

@ -1,7 +1,11 @@
/nb*
/target
/apktool-lib/nb*
/apktool-lib/target
/apktool-cli/nb*
/apktool-cli/target
.gradle/
brut.apktool.smali/baksmali/build*
brut.apktool.smali/build*
brut.apktool.smali/dexlib/build*
brut.apktool.smali/smali/build*
brut.apktool.smali/util/build*
brut.apktool/apktool-cli/build*
brut.apktool/apktool-lib/build*
brut.apktool/build*
build*
*~

View File

@ -61,35 +61,33 @@ subprojects {
}
}
project(':brut.apktool:apktool-lib') {
ext.baseVersion = '1.5.1'
ext.jarVersion = baseVersion
ext.baseVersion = '1.5.1'
ext.jarVersion = baseVersion
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 = 'SNAPSHOT'
}
if (!git.status().call().clean) {
versionSuffix += '-dirty'
}
} catch (Exception) {
// In case we can't get the commit for some reason,
// just use -dev
versionSuffix = 'SNAPSHOT'
}
version = baseVersion + '-' + versionSuffix
version = baseVersion + '-' + versionSuffix
// use <version>-dev for the jar name, rather than the
// full commit+dirty string
jarVersion = baseVersion + '-dev'
jar {
version = jarVersion
}
// use <version>-dev for the jar name, rather than the
// full commit+dirty string
jarVersion = baseVersion + '-dev'
jar {
version = jarVersion
}
dependencies {
compile ("junit:junit:4.10") {
exclude(module: 'hamcrest-core')

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@ -1,4 +1,4 @@
#Wed Sep 19 17:44:17 GMT-06:00 2012
#Wed Sep 19 19:34:23 GMT-06:00 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME