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

[Gradle] Make AbstractKotlinNativeCompile::manifestFile to be Provider

Browse Source 
KT-43293
This commit is contained in:
Anton Lakotka
2022-08-03 15:20:18 +02:00
committed by Space
parent 0d3f8cf91a
commit 4310778137
1 changed files with 3 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/KotlinNativeTasks.kt
+3 -2
View File
@@ -20,6 +20,7 @@ import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.file.FileTree import org.gradle.api.file.FileTree
import org.gradle.api.file.ProjectLayout import org.gradle.api.file.ProjectLayout
import org.gradle.api.file.RegularFile
import org.gradle.api.model.ObjectFactory import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider import org.gradle.api.provider.Provider
@@ -300,7 +301,7 @@ abstract class AbstractKotlinNativeCompile<
} }
@get:Internal @get:Internal
internal val manifestFile: File get() = projectLayout.buildDirectory.asFile.get().resolve("tmp/$name/inputManifest") internal val manifestFile: Provider<RegularFile> get() = projectLayout.buildDirectory.file("tmp/$name/inputManifest")
} }
// Remove it once actual K2NativeCompilerArguments will be available without 'kotlin.native.enabled = true' flag // Remove it once actual K2NativeCompilerArguments will be available without 'kotlin.native.enabled = true' flag
@@ -421,7 +422,7 @@ constructor(
var sharedCompilationData: SharedCompilationData? = null var sharedCompilationData: SharedCompilationData? = null
if (compilation is KotlinNativeFragmentMetadataCompilationData) { if (compilation is KotlinNativeFragmentMetadataCompilationData) {
val manifestFile: File = manifestFile val manifestFile: File = manifestFile.get().asFile
manifestFile.ensureParentDirsCreated() manifestFile.ensureParentDirsCreated()
val properties = java.util.Properties() val properties = java.util.Properties()
properties[KLIB_PROPERTY_NATIVE_TARGETS] = konanTargetsForManifest properties[KLIB_PROPERTY_NATIVE_TARGETS] = konanTargetsForManifest