From 06c5884d4d06cace3efde6e804c0d262319ee0d0 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 28 Jun 2022 13:41:07 +0200 Subject: [PATCH] Remove deprecated ConfigureUtil usages in CinteropSettings ^KT-46019 In Progress --- .../org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt | 2 -- .../plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt | 2 +- .../gradle/targets/native/DefaultCInteropSettings.kt | 7 ++----- .../gradle/targets/native/KotlinNativeCompilation.kt | 5 +---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt index 83b21abd081..8f922c4e2a6 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt +++ b/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) fun includeDirs(action: Action) fun includeDirs(configure: IncludeDirectories.() -> Unit) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt index 5c9fd116330..a2a92ea1103 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantInternal.kt +++ b/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) } 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 63e522afa76..35dd0fb2b7b 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 @@ -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) = includeDirs(ConfigureUtil.configureUsing(closure)) override fun includeDirs(action: Action) = includeDirs { action.execute(this) } override fun includeDirs(configure: IncludeDirectories.() -> Unit) = includeDirs.configure() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt index 11a1ab18880..fbe8a355b6f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt +++ b/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) = cinterops(ConfigureUtil.configureUsing(action)) fun cinterops(action: Action>) = action.execute(cinterops) // Naming