diff --git a/baksmali/build.gradle b/baksmali/build.gradle index 234ca843..dee884ce 100644 --- a/baksmali/build.gradle +++ b/baksmali/build.gradle @@ -65,7 +65,7 @@ task fatJar(type: Jar) { doLast { if (!System.getProperty('os.name').toLowerCase().contains('windows')) { - ant.symlink(link: file("${destinationDir}/baksmali.jar"), resource: archivePath, overwrite: true) + ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archivePath, overwrite: true) } } } @@ -87,7 +87,8 @@ publish { } task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { - def outFile = fatJar.destinationDir.getPath() + '/' + fatJar.baseName + '-' + fatJar.version + '-small' + '.' + fatJar.extension + def outFile = fatJar.destinationDirectory.file( + "${fatJar.archiveBaseName.get()}-${fatJar.archiveVersion.get()}-small.${fatJar.archiveExtension.get()}") injars fatJar.archivePath outjars outFile diff --git a/smali/build.gradle b/smali/build.gradle index a24a0483..555e31c7 100644 --- a/smali/build.gradle +++ b/smali/build.gradle @@ -101,7 +101,7 @@ task fatJar(type: Jar, dependsOn: jar) { doLast { if (!System.getProperty('os.name').toLowerCase().contains('windows')) { - ant.symlink(link: file("${destinationDir}/smali.jar"), resource: archivePath, overwrite: true) + ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archivePath, overwrite: true) } } } @@ -135,8 +135,8 @@ publish { } task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { - def outFile = fatJar.destinationDir.getPath() + '/' + fatJar.baseName + '-' + - fatJar.version + '-small' + '.' + fatJar.extension + def outFile = fatJar.destinationDirectory.file( + "${fatJar.archiveBaseName.get()}-${fatJar.archiveVersion.get()}-small.${fatJar.archiveExtension.get()}") injars fatJar.archivePath outjars outFile