[Gradle] reuse java's consumable configurations in the jvm target
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt index 20cab16..0896bc4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
@@ -98,6 +98,12 @@ var withJavaEnabled = false private set + override val runtimeElementsConfigurationName: String + get() = if (targetName == "jvm") JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME else super.apiElementsConfigurationName + + override val apiElementsConfigurationName: String + get() = if (targetName == "jvm") JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME else super.apiElementsConfigurationName + @Suppress("unused") // user DSL fun withJava() { if (withJavaEnabled) @@ -173,8 +179,8 @@ project.plugins.withType(JavaPlugin::class.java) { // Eliminate the Java output configurations from dependency resolution to avoid ambiguity between them and // the equivalent configurations created for the target: - project.configurations.findByName(JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)?.isCanBeConsumed = false - project.configurations.findByName(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME)?.isCanBeConsumed = false +// project.configurations.findByName(JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME)?.isCanBeConsumed = false +// project.configurations.findByName(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME)?.isCanBeConsumed = false disableJavaPluginTasks(javaSourceSets) }