ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-10-18 11:29:43 +02:00
Code Issues Projects Releases Wiki Activity

Use single-quotes in build.gradle files when double-quotes aren't needed

Browse Source 
Conflicts:
	brut.apktool.smali/baksmali/build.gradle
	brut.apktool.smali/smali/build.gradle
	build.gradle
This commit is contained in:
Ben Gruver 2015-03-01 22:00:30 -08:00 committed by Connor Tumbleson
parent d36b066007
commit df0156aa7e
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
brut.apktool.smali/baksmali/build.gradle
View File

@ -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) {

17
brut.apktool.smali/smali/build.gradle
View File

@ -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) {