fixup! Update defFileProperty initialisation and remove empty method from test
This commit is contained in:
+4
-2
@@ -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.plugin.mpp.pm20.util.disambiguateName
|
||||||
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier
|
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier
|
||||||
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
|
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
|
||||||
|
import org.jetbrains.kotlin.gradle.utils.property
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@@ -73,8 +74,9 @@ abstract class DefaultCInteropSettings @Inject constructor(
|
|||||||
target?.disambiguationClassifier ?: compilation.compilationClassifier
|
target?.disambiguationClassifier ?: compilation.compilationClassifier
|
||||||
)
|
)
|
||||||
|
|
||||||
val defFileProperty: Property<File> = objectFactory.property(File::class.java)
|
val defFileProperty: Property<File> = objectFactory.property<File>().value(
|
||||||
.apply { set(projectLayout.projectDirectory.asFile.resolve("src/nativeInterop/cinterop/$name.def")) }
|
projectLayout.projectDirectory.file("src/nativeInterop/cinterop/$name.def").asFile
|
||||||
|
)
|
||||||
|
|
||||||
var defFile: File
|
var defFile: File
|
||||||
get() = defFileProperty.get()
|
get() = defFileProperty.get()
|
||||||
|
|||||||
-10
@@ -13,16 +13,6 @@ import kotlin.test.assertEquals
|
|||||||
|
|
||||||
class CInteropTaskTest : MultiplatformExtensionTest() {
|
class CInteropTaskTest : MultiplatformExtensionTest() {
|
||||||
|
|
||||||
@BeforeTest
|
|
||||||
override fun setup() {
|
|
||||||
super.setup()
|
|
||||||
setupDefaultProjectWithCinterop()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupDefaultProjectWithCinterop() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `cinterop properties can be changed after creating`() {
|
fun `cinterop properties can be changed after creating`() {
|
||||||
fun DefaultCInteropSettings.setDummyValues(prefix: String) {
|
fun DefaultCInteropSettings.setDummyValues(prefix: String) {
|
||||||
|
|||||||
Reference in New Issue
Block a user