singleOutputFile() method used Task.getProject() and that's not allowed with CC
Required for KTI-1553
This commit is contained in:
committed by
Space Team
parent
21fff5634e
commit
cb0d78d443
@@ -315,7 +315,7 @@ val proguard by task<CacheableProguardTask> {
|
||||
**.class,**.properties,**.kt,**.kotlin_*,**.jnilib,**.so,**.dll,**.txt,**.caps,
|
||||
META-INF/services/**,META-INF/native/**,META-INF/extensions/**,META-INF/MANIFEST.MF,
|
||||
messages/**""".trimIndent()),
|
||||
provider { packCompiler.get().outputs.files.singleFile }
|
||||
packCompiler.map { it.outputs.files.singleFile }
|
||||
)
|
||||
|
||||
outjars(layout.buildDirectory.file("libs/$compilerBaseName-after-proguard.jar"))
|
||||
@@ -346,7 +346,7 @@ val proguard by task<CacheableProguardTask> {
|
||||
printconfiguration(layout.buildDirectory.file("compiler.pro.dump"))
|
||||
}
|
||||
|
||||
val pack = if (kotlinBuildProperties.proguard) proguard else packCompiler
|
||||
val pack: TaskProvider<out DefaultTask> = if (kotlinBuildProperties.proguard) proguard else packCompiler
|
||||
val distDir: String by rootProject.extra
|
||||
|
||||
val jar = runtimeJar {
|
||||
@@ -354,7 +354,7 @@ val jar = runtimeJar {
|
||||
dependsOn(compilerVersion)
|
||||
|
||||
from {
|
||||
zipTree(pack.get().singleOutputFile())
|
||||
pack.map { zipTree(it.singleOutputFile(layout)) }
|
||||
}
|
||||
|
||||
from {
|
||||
|
||||
Reference in New Issue
Block a user