From 2e7a9f737fa1a9221fcc8e0608a4ad9ff4840073 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 31 Aug 2022 12:25:04 +0200 Subject: [PATCH] fixup! Update defFileProperty initialisation and remove empty method from test --- .../gradle/targets/native/DefaultCInteropSettings.kt | 6 ++++-- .../org/jetbrains/kotlin/gradle/CInteropTaskTest.kt | 10 ---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt index bcb598dc2ab..a69d6f28665 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmNativeVariantCompila import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.disambiguateName import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName +import org.jetbrains.kotlin.gradle.utils.property import java.io.File import javax.inject.Inject @@ -73,8 +74,9 @@ abstract class DefaultCInteropSettings @Inject constructor( target?.disambiguationClassifier ?: compilation.compilationClassifier ) - val defFileProperty: Property = objectFactory.property(File::class.java) - .apply { set(projectLayout.projectDirectory.asFile.resolve("src/nativeInterop/cinterop/$name.def")) } + val defFileProperty: Property = objectFactory.property().value( + projectLayout.projectDirectory.file("src/nativeInterop/cinterop/$name.def").asFile + ) var defFile: File get() = defFileProperty.get() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt index 0d75c0d5782..cc7fd142b9f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt @@ -13,16 +13,6 @@ import kotlin.test.assertEquals class CInteropTaskTest : MultiplatformExtensionTest() { - @BeforeTest - override fun setup() { - super.setup() - setupDefaultProjectWithCinterop() - } - - private fun setupDefaultProjectWithCinterop() { - - } - @Test fun `cinterop properties can be changed after creating`() { fun DefaultCInteropSettings.setDummyValues(prefix: String) {