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

Fix gradle configuration cache in KotlinNativeLinkArtifactTask.

Browse Source
This commit is contained in:
konstantin.tskhovrebov
2022-09-30 10:05:14 +02:00
committed by Space Team
parent c83286ef7e
commit dffdc26208
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+4 -2
View File
@@ -89,8 +89,10 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
@get:Input @get:Input
abstract val binaryOptions: MapProperty<String, String> abstract val binaryOptions: MapProperty<String, String>
private val nativeBinaryOptions = PropertiesProvider(project).nativeBinaryOptions
@get:Input @get:Input
internal val allBinaryOptions get() = PropertiesProvider(project).nativeBinaryOptions + binaryOptions.get() internal val allBinaryOptions: Provider<Map<String, String>> = binaryOptions.map { it + nativeBinaryOptions }
override val toolOptions: CompilerCommonToolOptions = objectFactory override val toolOptions: CompilerCommonToolOptions = objectFactory
.newInstance<CompilerCommonToolOptionsDefault>() .newInstance<CompilerCommonToolOptionsDefault>()
@@ -205,7 +207,7 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
entryPoint = entryPoint.getOrNull(), entryPoint = entryPoint.getOrNull(),
embedBitcode = embedBitcode.get(), embedBitcode = embedBitcode.get(),
linkerOpts = linkerOptions.get(), linkerOpts = linkerOptions.get(),
binaryOptions = allBinaryOptions, binaryOptions = allBinaryOptions.get(),
isStaticFramework = staticFramework.get(), isStaticFramework = staticFramework.get(),
exportLibraries = exportLibraries.klibs(), exportLibraries = exportLibraries.klibs(),
includeLibraries = includeLibraries.klibs(), includeLibraries = includeLibraries.klibs(),