merge in pi-release history after reset to master
diff --git a/library/build.gradle b/library/build.gradle
index 83cbd27..abb8c49 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -16,25 +16,6 @@
apply plugin: 'com.android.library'
-def generatedResourceDir = project.file('generatedResource')
-def versionFile = new File(generatedResourceDir, 'androidsupportmultidexversion.txt')
-
-task makeVersionFile(type:Exec) {
-
- doFirst {
- versionFile.getParentFile().mkdirs()
- }
-
- outputs.files versionFile
-
- commandLine 'sh', '-c', 'git log --format="%H" -n 1 || (echo git hash not available; exit 0)'
- standardOutput = new ByteArrayOutputStream()
-
- doLast {
- versionFile.text = "git.version=" + standardOutput.toString()
- }
-}
-
android {
compileSdkVersion 4
@@ -42,15 +23,10 @@
minSdkVersion 4
}
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
- }
-
sourceSets {
main {
java.srcDirs = ['src']
- resources.srcDirs = ['res', makeVersionFile.outputs]
+ resources.srcDirs = ['res']
res.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml'
}
@@ -62,10 +38,6 @@
}
}
-android.libraryVariants.all {
- v -> v.getJavaCompiler().dependsOn(makeVersionFile)
-}
-
uploadArchives {
repositories {
mavenDeployer {
diff --git a/version.gradle b/version.gradle
index f9f6e1f..d216a30 100644
--- a/version.gradle
+++ b/version.gradle
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-ext.multidexVersion = '1.0.3'
+ext.multidexVersion = '1.0.2'