From df0156aa7e7046722743a210a029a82e0cb0f39f Mon Sep 17 00:00:00 2001
From: Ben Gruver <jesusfreke@jesusfreke.com>
Date: Sun, 1 Mar 2015 22:00:30 -0800
Subject: [PATCH] Use single-quotes in build.gradle files when double-quotes
 aren't needed

Conflicts:
	brut.apktool.smali/baksmali/build.gradle
	brut.apktool.smali/smali/build.gradle
	build.gradle
---
 brut.apktool.smali/baksmali/build.gradle | 23 ++++++++++++++++++++++-
 brut.apktool.smali/smali/build.gradle    | 17 +++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/brut.apktool.smali/baksmali/build.gradle b/brut.apktool.smali/baksmali/build.gradle
index 61304950..07310942 100644
--- a/brut.apktool.smali/baksmali/build.gradle
+++ b/brut.apktool.smali/baksmali/build.gradle
@@ -57,8 +57,29 @@ task fatJar (type: Jar) {
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 
     manifest {
-        attributes("Main-Class": "org.jf.baksmali.main")
+        attributes('Main-Class': 'org.jf.baksmali.main')
     }
+<<<<<<< HEAD:brut.apktool.smali/baksmali/build.gradle
+=======
+
+    doLast {
+        if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
+            ant.symlink(link: file("${destinationDir}/baksmali.jar"), resource: archivePath, overwrite: true)
+        }
+    }
+}
+tasks.getByPath('build').dependsOn(fatJar)
+
+uploadArchives {
+    repositories.mavenDeployer {
+        pom.project {
+            description 'baksmali is a disassembler for dalvik bytecode'
+            scm {
+                url 'https://github.com/JesusFreke/smali/tree/master/baksmali'
+            }
+        }
+    }
+>>>>>>> f0c481a... Use single-quotes in build.gradle files when double-quotes aren't needed:baksmali/build.gradle
 }
 
 task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
diff --git a/brut.apktool.smali/smali/build.gradle b/brut.apktool.smali/smali/build.gradle
index 7bc75428..5f409fbc 100644
--- a/brut.apktool.smali/smali/build.gradle
+++ b/brut.apktool.smali/smali/build.gradle
@@ -90,21 +90,30 @@ task fatJar (type: Jar) {
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 
     manifest {
-        attributes("Main-Class": "org.jf.smali.main")
+        attributes('Main-Class': 'org.jf.smali.main')
     }
+<<<<<<< HEAD:brut.apktool.smali/smali/build.gradle
+=======
+
+    doLast {
+        if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
+            ant.symlink(link: file("${destinationDir}/smali.jar"), resource: archivePath, overwrite: true)
+        }
+    }
+>>>>>>> f0c481a... Use single-quotes in build.gradle files when double-quotes aren't needed:smali/build.gradle
 }
 tasks.getByPath('build').dependsOn(fatJar)
 
 generateTestGrammarSource {
-    outputDirectory = new File(outputDirectory, "org/jf/smali")
+    outputDirectory = new File(outputDirectory, 'org/jf/smali')
 }
 
 generateGrammarSource {
-    outputDirectory = new File(outputDirectory, "org/jf/smali")
+    outputDirectory = new File(outputDirectory, 'org/jf/smali')
 }
 
 generateJFlexSource {
-    outputDirectory = new File(outputDirectory, "org/jf/smali")
+    outputDirectory = new File(outputDirectory, 'org/jf/smali')
 }
 
 task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {