azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert main task creating helper to lazy API, refactor accordingly

Browse Source
This commit is contained in:
Ilya Chernikov
2019-08-14 15:42:42 +02:00
parent 0f41dc814f
commit 2ed8fa7624
8 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/build.gradle.kts
+9 -9
View File
@@ -123,14 +123,14 @@ val reflectShadowJar by task<ShadowJar> {
}
}
val stripMetadata by tasks.creating {
val stripMetadata by tasks.registering {
dependsOn(reflectShadowJar)
val inputJar = reflectShadowJar.outputs.files.singleFile
val inputJar = provider { reflectShadowJar.get().outputs.files.singleFile }
val outputJar = File("$libsDir/kotlin-reflect-stripped.jar")
inputs.file(inputJar)
outputs.file(outputJar)
doLast {
stripMetadata(logger, "kotlin/reflect/jvm/internal/impl/.*", inputJar, outputJar)
stripMetadata(logger, "kotlin/reflect/jvm/internal/impl/.*", inputJar.get(), outputJar)
}
}
@@ -138,10 +138,10 @@ val proguardOutput = "$libsDir/${property("archivesBaseName")}-proguard.jar"
val proguard by task<ProGuardTask> {
dependsOn(stripMetadata)
inputs.files(stripMetadata.outputs.files)
inputs.files(stripMetadata.get().outputs.files)
outputs.file(proguardOutput)
injars(mapOf("filter" to "!META-INF/versions/**"), stripMetadata.outputs.files)
injars(mapOf("filter" to "!META-INF/versions/**"), stripMetadata.get().outputs.files)
injars(mapOf("filter" to "!META-INF/**,!**/*.kotlin_builtins"), proguardAdditionalInJars)
outjars(proguardOutput)
@@ -198,7 +198,7 @@ val result by task<Jar> {
dependsOn(task)
from {
zipTree(task.outputs.files.singleFile)
zipTree(task.get().outputs.files.singleFile)
}
callGroovy("manifestAttributes", manifest, project, "Main")
@@ -208,7 +208,7 @@ val modularJar by task<Jar> {
dependsOn(proguard)
archiveClassifier.set("modular")
from(zipTree(file(proguardOutput)))
from(zipTree(reflectShadowJar.archivePath)) {
from(zipTree(reflectShadowJar.get().archivePath)) {
include("META-INF/versions/**")
}
callGroovy("manifestAttributes", manifest, project, "Main", true)
@@ -216,14 +216,14 @@ val modularJar by task<Jar> {
val dexMethodCount by task<DexMethodCount> {
dependsOn(result)
jarFile = result.outputs.files.single()
jarFile = result.get().outputs.files.single()
ownPackages = listOf("kotlin.reflect")
}
tasks.getByName("check").dependsOn(dexMethodCount)
artifacts {
listOf(mainJar.name, "runtime", "archives").forEach { configurationName ->
add(configurationName, result.outputs.files.singleFile) {
add(configurationName, result.get().outputs.files.singleFile) {
builtBy(result)
}
}
libraries/tools/kotlin-main-kts/build.gradle.kts
+4 -4
View File
@@ -73,24 +73,24 @@ val proguard by task<ProGuardTask> {
dependsOn(packJar)
configuration("main-kts.pro")
injars(mapOf("filter" to "!META-INF/versions/**"), packJar.outputs.files)
injars(mapOf("filter" to "!META-INF/versions/**"), packJar.get().outputs.files)
val outputJar = fileFrom(buildDir, "libs", "$jarBaseName-$version-after-proguard.jar")
outjars(outputJar)
inputs.files(packJar.outputs.files.singleFile)
inputs.files(packJar.get().outputs.files.singleFile)
outputs.file(outputJar)
libraryjars(mapOf("filter" to "!META-INF/versions/**"), proguardLibraryJars)
}
val resultJar = tasks.register<Jar>("resultJar") {
val resultJar by task<Jar> {
val pack = if (kotlinBuildProperties.proguard) proguard else packJar
dependsOn(pack)
setupPublicJar(jarBaseName)
from {
zipTree(pack.outputs.files.singleFile)
zipTree(pack.get().outputs.files.singleFile)
}
}