azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gradle-plugin] Fix dependencies between building and publishing

Browse Source
This commit is contained in:
Ilya Matveev
2018-04-24 16:40:22 +07:00
committed by ilmat192
parent b54685e742
commit 93b8a0595c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
-1
View File
@@ -358,7 +358,6 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
val artifactId = buildingConfig.name val artifactId = buildingConfig.name
val konanSoftwareComponent = buildingConfig.mainVariant val konanSoftwareComponent = buildingConfig.mainVariant
project.extensions.configure(PublishingExtension::class.java) { project.extensions.configure(PublishingExtension::class.java) {
val publishing = it
it.publications.create(artifactId, MavenPublication::class.java) { it.publications.create(artifactId, MavenPublication::class.java) {
it.artifactId = artifactId it.artifactId = artifactId
it.groupId = project.group.toString() it.groupId = project.group.toString()
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanBaseTasks.kt
+3 -2
View File
@@ -24,6 +24,7 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.PublishArtifact import org.gradle.api.artifacts.PublishArtifact
import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.Attribute
import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage
import org.gradle.api.internal.tasks.DefaultTaskDependency
import org.gradle.api.tasks.* import org.gradle.api.tasks.*
import org.gradle.language.cpp.CppBinary import org.gradle.language.cpp.CppBinary
import org.gradle.language.cpp.internal.NativeVariant import org.gradle.language.cpp.internal.NativeVariant
@@ -104,11 +105,11 @@ abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec {
override fun getClassifier():String? = target.name override fun getClassifier():String? = target.name
override fun getFile() = artifact override fun getFile() = artifact
override fun getDate() = Date(artifact.lastModified()) override fun getDate() = Date(artifact.lastModified())
override fun getBuildDependencies(): TaskDependency = this@KonanArtifactTask.taskDependencies override fun getBuildDependencies(): TaskDependency =
DefaultTaskDependency().apply { add(this@KonanArtifactTask) }
}) })
val objectFactory = project.objects val objectFactory = project.objects
val linkUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_LINK) val linkUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_LINK)
val runtimeUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_RUNTIME)
val konanSoftwareComponent = config.mainVariant val konanSoftwareComponent = config.mainVariant
konanSoftwareComponent.addVariant(NativeVariant(Names.of("${artifact.name.removeSuffix("$artifactSuffix")}_${target.name}"), linkUsage, null, linkUsage, platformConfiguration)) konanSoftwareComponent.addVariant(NativeVariant(Names.of("${artifact.name.removeSuffix("$artifactSuffix")}_${target.name}"), linkUsage, null, linkUsage, platformConfiguration))
} }