Remove deprecated ConfigureUtil usages in CinteropSettings

^KT-46019 In Progress

libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.gradle.plugin
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.Named
 import org.gradle.api.file.FileCollection
@@ -38,7 +37,6 @@ interface CInteropSettings : Named {
     fun headers(files: FileCollection)
 
     fun includeDirs(vararg values: Any)
-    fun includeDirs(closure: Closure<Unit>)
     fun includeDirs(action: Action<IncludeDirectories>)
     fun includeDirs(configure: IncludeDirectories.() -> Unit)
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt

@@ -35,7 +35,7 @@ abstract class GradleKpmNativeVariantInternal(
         get() = listOf(apiElementsConfiguration.name).flatMap { listOf(it, publishedConfigurationName(it)) }.toSet()
 
     val cinterops = project.container(DefaultCInteropSettings::class.java) { cinteropName ->
-        DefaultCInteropSettings(project, cinteropName, compilationData)
+        project.objects.newInstance(DefaultCInteropSettings::class.java, project, cinteropName, compilationData)
     }
 
     override val compilationData by lazy { GradleKpmNativeVariantCompilationData(this) }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt

@@ -6,13 +6,11 @@
 @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
-import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.plugin.CInteropSettings
 import org.jetbrains.kotlin.gradle.plugin.CInteropSettings.IncludeDirectories
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -24,13 +22,13 @@ import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
 import java.io.File
 import javax.inject.Inject
 
-open class DefaultCInteropSettings @Inject constructor(
+abstract class DefaultCInteropSettings @Inject constructor(
     private val project: Project,
     private val name: String,
     override val compilation: KotlinNativeCompilationData<*>
 ) : CInteropSettings {
 
-    inner class DefaultIncludeDirectories : CInteropSettings.IncludeDirectories {
+    inner class DefaultIncludeDirectories : IncludeDirectories {
         var allHeadersDirs: FileCollection = project.files()
         var headerFilterDirs: FileCollection = project.files()
 
@@ -114,7 +112,6 @@ open class DefaultCInteropSettings @Inject constructor(
     }
 
     override fun includeDirs(vararg values: Any) = includeDirs.allHeaders(values.toList())
-    override fun includeDirs(closure: Closure<Unit>) = includeDirs(ConfigureUtil.configureUsing(closure))
     override fun includeDirs(action: Action<IncludeDirectories>) = includeDirs { action.execute(this) }
     override fun includeDirs(configure: IncludeDirectories.() -> Unit) = includeDirs.configure()
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt

@@ -6,12 +6,10 @@
 @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.util.ConfigureUtil
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinNativeCompilationData
@@ -98,10 +96,9 @@ abstract class KotlinNativeCompilation @Inject constructor(
 
     // Interop DSL.
     val cinterops = project.container(DefaultCInteropSettings::class.java) { cinteropName ->
-        DefaultCInteropSettings(project, cinteropName, this)
+        project.objects.newInstance(DefaultCInteropSettings::class.java, project, cinteropName, this)
     }
 
-    fun cinterops(action: Closure<Unit>) = cinterops(ConfigureUtil.configureUsing(action))
     fun cinterops(action: Action<NamedDomainObjectContainer<DefaultCInteropSettings>>) = action.execute(cinterops)
 
     // Naming