Fixes after review

This commit is contained in:
Ilya Chernikov
2018-01-15 12:49:50 +01:00
committed by Vyacheslav Gerasimov
parent 14e586d5a5
commit 058ef31d7a
15 changed files with 41 additions and 51 deletions
@@ -97,7 +97,6 @@ val extractAndroidJar by tasks.creating {
inputs.files(androidPlatform)
val targetFile = File(libsDestDir, "android.jar")
outputs.files(targetFile)
outputs.upToDateWhen { targetFile.exists() } // TODO: consider more precise check, e.g. hash-based
doFirst {
project.copy {
from(zipTree(androidPlatform.singleFile).matching { include("**/android.jar") }.files.first())
@@ -21,10 +21,7 @@ dependencies {
}
task("prepare") {
// TODO: find out why it doesn't work without explicit dependsOn
dependsOn(":custom-dependencies:protobuf-relocated:prepare")
val inputJar = relocatedProtobuf.files.single()
inputs.files(inputJar)
inputs.files(relocatedProtobuf) // this also adds a dependency
outputs.file(outputJarPath)
doFirst {
File(outputJarPath).parentFile.mkdirs()
@@ -49,7 +46,7 @@ task("prepare") {
return result
}
val allFiles = loadAllFromJar(File(inputJar))
val allFiles = loadAllFromJar(File(relocatedProtobuf.singleFile))
val keepClasses = arrayListOf<String>()