From 8e75845309796490ad49b57a782eade8cc69fb82 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 17 Aug 2018 15:40:33 +0700 Subject: [PATCH] [gradle-plugin] Fix paths for source and javadoc jars --- .../experimental/internal/AbstractKotlinNativeComponent.kt | 4 ++-- .../gradle/plugin/experimental/plugins/KotlinNativePlugin.kt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeComponent.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeComponent.kt index aad0e9ec96e..d97d3b764e4 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeComponent.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/internal/AbstractKotlinNativeComponent.kt @@ -89,8 +89,8 @@ abstract class AbstractKotlinNativeComponent @Inject constructor( poms.add(action) } - override val publishJavadoc: Boolean = true - override val publishSources: Boolean = true + override var publishJavadoc: Boolean = true + override var publishSources: Boolean = true // endregion } \ No newline at end of file diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt index f962280d2a2..0689c047806 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/experimental/plugins/KotlinNativePlugin.kt @@ -195,6 +195,7 @@ class KotlinNativePlugin @Inject constructor(val attributesFactory: ImmutableAtt private fun KotlinNativeSourceSetImpl.createSourcesJarTask(target: KonanTarget): Jar = createJarTask("sourcesJar${name.capitalize()}${target.name.capitalize()}") { + it.destinationDir = project.buildDir.resolve("libs") it.appendix = "$name-${target.name}" it.classifier = "sources" it.from(getAllSources(target)) @@ -202,6 +203,7 @@ class KotlinNativePlugin @Inject constructor(val attributesFactory: ImmutableAtt private fun KotlinNativeSourceSetImpl.createEmptyJarTask(namePrefix: String, classifier: String): Jar = createJarTask("$namePrefix${name.capitalize()}") { + it.destinationDir = project.buildDir.resolve("libs") it.appendix = name it.classifier = classifier }