diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt index 597ebd1ca4b..b8accd3f951 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt @@ -62,13 +62,13 @@ abstract class KonanTargetableTask: DefaultTask() { abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec { open val artifact: File - @OutputFile get() = destinationDir.resolve(artifactNameWithSuffix) + @OutputFile get() = destinationDir.resolve(artifactFullName) @Internal lateinit var destinationDir: File @Internal lateinit var artifactName: String - protected val artifactNameWithSuffix: String - @Internal get() = "$artifactName$artifactSuffix" + protected val artifactFullName: String + @Internal get() = "$artifactPrefix$artifactName$artifactSuffix" val artifactPath: String @Internal get() = artifact.canonicalPath @@ -76,6 +76,9 @@ abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec { protected abstract val artifactSuffix: String @Internal get + protected abstract val artifactPrefix: String + @Internal get + internal open fun init(destinationDir: File, artifactName: String, target: KonanTarget) { super.init(target) this.destinationDir = destinationDir diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt index 4cd5c01adb0..2af9b983871 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt @@ -46,6 +46,9 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec { override val artifactSuffix: String @Internal get() = produce.kind.suffix(konanTarget) + override val artifactPrefix: String + @Internal get() = produce.kind.prefix(konanTarget) + // Other compilation parameters ------------------------------------------- protected val srcFiles_ = mutableSetOf() diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanInteropTask.kt index 35f6c4a7bb5..be8239fa55e 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanInteropTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanInteropTask.kt @@ -44,6 +44,9 @@ open class KonanInteropTask: KonanBuildingTask(), KonanInteropSpec { override val artifactSuffix: String @Internal get() = ".klib" + override val artifactPrefix: String + @Internal get() = "" + // Interop stub generator parameters ------------------------------------- @InputFile lateinit var defFile: File