diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/KotlinNativeBinaries.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/KotlinNativeBinaries.kt index 3f30576bcc9..17872b3311b 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/KotlinNativeBinaries.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/KotlinNativeBinaries.kt @@ -59,7 +59,7 @@ interface KotlinNativeBinary : ComponentWithDependencies, BuildableComponent, Co * The link libraries (klibs only!) used to link this binary. * Includes the link libraries of the component's dependencies. */ - val klibraries: FileCollection + val klibs: FileCollection /** * Binary kind in terms of the KN compiler (program, library, dynamic etc). diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt index 75a16e7a67c..f83acabd07b 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeBinary.kt @@ -102,8 +102,8 @@ abstract class AbstractKotlinNativeBinary( override fun getDependencies(): ComponentDependencies = dependencies fun getImplementationDependencies(): Configuration = dependencies.implementationDependencies - // A configuration containing klibraries - override val klibraries = configurations.create(names.withPrefix("klibraries")).apply { + // A configuration containing klibs + override val klibs = configurations.create(names.withPrefix("klibs")).apply { isCanBeConsumed = false attributes.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, KotlinNativeUsage.KLIB)) attributes.attribute(CppBinary.DEBUGGABLE_ATTRIBUTE, debuggable) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt index db463588a1b..a1fa28a089e 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativeBasePlugin.kt @@ -213,7 +213,7 @@ class KotlinNativeBasePlugin: Plugin { } } - klibraries.dependencies.add(project.dependencies.create(files(interopTask.outputFileProvider))) + klibs.dependencies.add(project.dependencies.create(files(interopTask.outputFileProvider))) if (this is KotlinNativeLibrary) { linkElements.get().outgoing.artifact(interopTask.outputFileProvider) { diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt index 4a49c4ee82f..305cc15c3ee 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/tasks/KotlinNativeCompile.kt @@ -54,12 +54,12 @@ open class KotlinNativeCompile @Inject constructor(internal val binary: Abstract } val libraries: Configuration - @InputFiles get() = binary.klibraries + @InputFiles get() = binary.klibs override fun getClasspath(): FileCollection = libraries override fun setClasspath(configuration: FileCollection?) { - throw UnsupportedOperationException("Use klibraries to set compile classpath in Kotlin/Native") + throw UnsupportedOperationException("Use klibs to set compile classpath in Kotlin/Native") } val optimized: Boolean @Input get() = binary.optimized diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt index af8c8dde354..9499fec4ffd 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/model/KonanModelImpl.kt @@ -70,8 +70,8 @@ object KonanToolingModelBuilder : ToolingModelBuilder { compileTask.name, sourceRoots.toList(), sources.files.toList(), - klibraries.files.toList(), - klibraries.files.map { it.parentFile } + klibs.files.toList(), + klibs.files.map { it.parentFile } ) }