azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fix NativeInteropPlugin for Gradle 7

Browse Source 
Required for Gradle 7+ #KTI-559
This commit is contained in:
Vyacheslav Gerasimov
2021-07-21 19:07:36 +03:00
parent f91d6958a8
commit d9444da9b5
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
+3 -7
View File
@@ -24,13 +24,9 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.internal.AbstractNamedDomainObjectContainer import org.gradle.api.internal.AbstractNamedDomainObjectContainer
import org.gradle.api.internal.CollectionCallbackActionDecorator import org.gradle.api.internal.CollectionCallbackActionDecorator
import org.gradle.api.internal.file.AbstractFileCollection
import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.JavaExec
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.TaskDependency
import org.gradle.internal.reflect.Instantiator import org.gradle.internal.reflect.Instantiator
import org.jetbrains.kotlin.konan.target.*
import org.jetbrains.kotlin.konan.util.*
class NamedNativeInteropConfig implements Named { class NamedNativeInteropConfig implements Named {
@@ -189,11 +185,11 @@ class NamedNativeInteropConfig implements Named {
interopStubs.kotlin.srcDirs generatedSrcDir interopStubs.kotlin.srcDirs generatedSrcDir
project.dependencies { project.dependencies {
add interopStubs.getCompileConfigurationName(), project(path: ':kotlin-native:Interop:Runtime') add interopStubs.getApiConfigurationName(), project(path: ':kotlin-native:Interop:Runtime')
add interopStubs.getCompileConfigurationName(), "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}" 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) project.dependencies.add(this.configuration.name, interopStubs.output)
} }