From d9444da9b5cc7b35ddcc38da227d3433cb4a6ab6 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 21 Jul 2021 19:07:36 +0300 Subject: [PATCH] Build: Fix NativeInteropPlugin for Gradle 7 Required for Gradle 7+ #KTI-559 --- .../org/jetbrains/kotlin/NativeInteropPlugin.groovy | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy index b781107c312..7c3897c4c8b 100644 --- a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy +++ b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy @@ -24,13 +24,9 @@ import org.gradle.api.artifacts.Configuration import org.gradle.api.file.FileCollection import org.gradle.api.internal.AbstractNamedDomainObjectContainer import org.gradle.api.internal.CollectionCallbackActionDecorator -import org.gradle.api.internal.file.AbstractFileCollection import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.SourceSet -import org.gradle.api.tasks.TaskDependency import org.gradle.internal.reflect.Instantiator -import org.jetbrains.kotlin.konan.target.* -import org.jetbrains.kotlin.konan.util.* class NamedNativeInteropConfig implements Named { @@ -189,11 +185,11 @@ class NamedNativeInteropConfig implements Named { interopStubs.kotlin.srcDirs generatedSrcDir project.dependencies { - add interopStubs.getCompileConfigurationName(), project(path: ':kotlin-native:Interop:Runtime') - add interopStubs.getCompileConfigurationName(), "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}" + add interopStubs.getApiConfigurationName(), project(path: ':kotlin-native:Interop:Runtime') + add interopStubs.getApiConfigurationName(), "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}" } - this.configuration.extendsFrom project.configurations[interopStubs.runtimeConfigurationName] + this.configuration.extendsFrom project.configurations[interopStubs.getRuntimeClasspathConfigurationName()] project.dependencies.add(this.configuration.name, interopStubs.output) }