diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index 41136264693..9d1938b9ebb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -59,24 +59,6 @@ interface CompilationDetailsWithRuntime : CompilationDe internal val CompilationDetails<*>.associateCompilationsClosure: Iterable> get() = closure { it.associateCompilations } -open class DefaultCompilationDetailsWithRuntime( - target: KotlinTarget, - compilationPurpose: String, - defaultSourceSet: KotlinSourceSet, - createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, - createKotlinOptions: DefaultCompilationDetails.() -> T -) : DefaultCompilationDetails( - target, compilationPurpose, defaultSourceSet, createCompilerOptions, createKotlinOptions -), CompilationDetailsWithRuntime { - override val runtimeDependencyFilesHolder: GradleKpmDependencyFilesHolder = project.newDependencyFilesHolder( - lowerCamelCaseName( - target.disambiguationClassifier, - compilationPurpose.takeIf { it != KotlinCompilation.MAIN_COMPILATION_NAME }.orEmpty(), - "runtimeClasspath" - ) - ) -} - open class NativeCompilationDetails( target: KotlinTarget, compilationPurpose: String, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultCompilationDetailsWithRuntime.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultCompilationDetailsWithRuntime.kt new file mode 100644 index 00000000000..c8ccbd69bbd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultCompilationDetailsWithRuntime.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.plugin.mpp + +import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation +import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.GradleKpmDependencyFilesHolder +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.newDependencyFilesHolder +import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName + +open class DefaultCompilationDetailsWithRuntime( + target: KotlinTarget, + compilationPurpose: String, + defaultSourceSet: KotlinSourceSet, + createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, + createKotlinOptions: DefaultCompilationDetails.() -> T +) : DefaultCompilationDetails( + target, compilationPurpose, defaultSourceSet, createCompilerOptions, createKotlinOptions +), CompilationDetailsWithRuntime { + override val runtimeDependencyFilesHolder: GradleKpmDependencyFilesHolder = project.newDependencyFilesHolder( + lowerCamelCaseName( + target.disambiguationClassifier, + compilationPurpose.takeIf { it != KotlinCompilation.MAIN_COMPILATION_NAME }.orEmpty(), + "runtimeClasspath" + ) + ) +} \ No newline at end of file