[Gradle] Fix warnings in kotlin-native-build-tools
^KT-56904 In Progress
This commit is contained in:
committed by
Space Team
parent
de40306f8e
commit
11fee106b2
@@ -279,7 +279,6 @@ fun Task.dependsOnKonanBuildingTask(artifact: String, target: KonanTarget) {
|
|||||||
|
|
||||||
//endregion
|
//endregion
|
||||||
|
|
||||||
@JvmOverloads
|
|
||||||
fun compileSwift(
|
fun compileSwift(
|
||||||
project: Project, target: KonanTarget, sources: List<String>, options: List<String>,
|
project: Project, target: KonanTarget, sources: List<String>, options: List<String>,
|
||||||
output: Path
|
output: Path
|
||||||
|
|||||||
+2
-8
@@ -11,11 +11,8 @@ import org.gradle.api.DefaultTask
|
|||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.artifacts.*
|
import org.gradle.api.artifacts.*
|
||||||
import org.gradle.api.attributes.Attribute
|
import org.gradle.api.attributes.Attribute
|
||||||
import org.gradle.api.attributes.AttributeContainer
|
|
||||||
import org.gradle.api.attributes.Usage
|
import org.gradle.api.attributes.Usage
|
||||||
import org.gradle.api.capabilities.Capability
|
|
||||||
import org.gradle.api.internal.component.DefaultSoftwareComponentVariant
|
import org.gradle.api.internal.component.DefaultSoftwareComponentVariant
|
||||||
import org.gradle.api.internal.component.UsageContext
|
|
||||||
import org.gradle.api.internal.tasks.DefaultTaskDependency
|
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
|
||||||
@@ -24,7 +21,6 @@ import org.jetbrains.kotlin.gradle.plugin.experimental.internal.compatibleVarian
|
|||||||
import org.jetbrains.kotlin.gradle.plugin.konan.*
|
import org.jetbrains.kotlin.gradle.plugin.konan.*
|
||||||
import org.jetbrains.kotlin.konan.target.HostManager
|
import org.jetbrains.kotlin.konan.target.HostManager
|
||||||
import org.jetbrains.kotlin.konan.target.KonanTarget
|
import org.jetbrains.kotlin.konan.target.KonanTarget
|
||||||
import org.jetbrains.kotlin.gradle.plugin.konan.*
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.konan.konanTargets
|
import org.jetbrains.kotlin.gradle.plugin.konan.konanTargets
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.util.*
|
import java.util.*
|
||||||
@@ -94,20 +90,18 @@ abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec {
|
|||||||
attribute(Attribute.of("org.gradle.native.kotlin.platform", String::class.java), target.name)
|
attribute(Attribute.of("org.gradle.native.kotlin.platform", String::class.java), target.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
val artifactNameWithoutSuffix = artifact.name.removeSuffix("$artifactSuffix")
|
val artifactNameWithoutSuffix = artifact.name.removeSuffix(artifactSuffix)
|
||||||
project.pluginManager.withPlugin("maven-publish") {
|
project.pluginManager.withPlugin("maven-publish") {
|
||||||
platformConfiguration.artifacts.add(object: PublishArtifact {
|
platformConfiguration.artifacts.add(object: PublishArtifact {
|
||||||
override fun getName(): String = artifactNameWithoutSuffix
|
override fun getName(): String = artifactNameWithoutSuffix
|
||||||
override fun getExtension() = if (artifactSuffix.startsWith('.')) artifactSuffix.substring(1) else artifactSuffix
|
override fun getExtension() = if (artifactSuffix.startsWith('.')) artifactSuffix.substring(1) else artifactSuffix
|
||||||
override fun getType() = artifactSuffix
|
override fun getType() = artifactSuffix
|
||||||
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 =
|
override fun getBuildDependencies(): TaskDependency =
|
||||||
DefaultTaskDependency().apply { add(this@KonanArtifactTask) }
|
DefaultTaskDependency().apply { add(this@KonanArtifactTask) }
|
||||||
})
|
})
|
||||||
val objectFactory = project.objects
|
|
||||||
val linkUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_LINK)
|
|
||||||
val konanSoftwareComponent = config.mainVariant
|
val konanSoftwareComponent = config.mainVariant
|
||||||
val variantName = "${artifactNameWithoutSuffix}_${target.name}"
|
val variantName = "${artifactNameWithoutSuffix}_${target.name}"
|
||||||
val context = DefaultSoftwareComponentVariant(
|
val context = DefaultSoftwareComponentVariant(
|
||||||
|
|||||||
+2
-1
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.library.uniqueName
|
|||||||
import org.jetbrains.kotlin.*
|
import org.jetbrains.kotlin.*
|
||||||
import org.jetbrains.kotlin.util.Logger
|
import org.jetbrains.kotlin.util.Logger
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
enum class KonanCacheKind(val outputKind: CompilerOutputKind) {
|
enum class KonanCacheKind(val outputKind: CompilerOutputKind) {
|
||||||
STATIC(CompilerOutputKind.STATIC_CACHE),
|
STATIC(CompilerOutputKind.STATIC_CACHE),
|
||||||
@@ -105,7 +106,7 @@ abstract class KonanCacheTask : DefaultTask() {
|
|||||||
val args = mutableListOf(
|
val args = mutableListOf(
|
||||||
"-g",
|
"-g",
|
||||||
"-target", target,
|
"-target", target,
|
||||||
"-produce", cacheKind.outputKind.name.toLowerCase(),
|
"-produce", cacheKind.outputKind.name.lowercase(Locale.getDefault()),
|
||||||
"-Xadd-cache=${originalKlib.asFile.get().absolutePath}",
|
"-Xadd-cache=${originalKlib.asFile.get().absolutePath}",
|
||||||
"-Xcache-directory=${cacheDirectory.absolutePath}"
|
"-Xcache-directory=${cacheDirectory.absolutePath}"
|
||||||
)
|
)
|
||||||
|
|||||||
+5
-3
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.gradle.plugin.tasks
|
|||||||
|
|
||||||
import org.gradle.api.file.FileCollection
|
import org.gradle.api.file.FileCollection
|
||||||
import org.gradle.api.tasks.*
|
import org.gradle.api.tasks.*
|
||||||
|
import org.gradle.api.tasks.Optional
|
||||||
import org.gradle.process.CommandLineArgumentProvider
|
import org.gradle.process.CommandLineArgumentProvider
|
||||||
import org.jetbrains.kotlin.gradle.plugin.konan.*
|
import org.jetbrains.kotlin.gradle.plugin.konan.*
|
||||||
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
|
import org.jetbrains.kotlin.konan.target.CompilerOutputKind
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A task compiling the target executable/library using Kotlin/Native compiler
|
* A task compiling the target executable/library using Kotlin/Native compiler
|
||||||
@@ -141,7 +143,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
|
|||||||
/** Args passed to the compiler at the first stage of two-stage compilation (klib building). */
|
/** Args passed to the compiler at the first stage of two-stage compilation (klib building). */
|
||||||
protected fun buildFirstStageArgs(klibPath: String) = mutableListOf<String>().apply {
|
protected fun buildFirstStageArgs(klibPath: String) = mutableListOf<String>().apply {
|
||||||
addArg("-output", klibPath)
|
addArg("-output", klibPath)
|
||||||
addArg("-produce", CompilerOutputKind.LIBRARY.name.toLowerCase())
|
addArg("-produce", CompilerOutputKind.LIBRARY.name.lowercase(Locale.getDefault()))
|
||||||
|
|
||||||
addAll(buildCommonArgs())
|
addAll(buildCommonArgs())
|
||||||
|
|
||||||
@@ -156,7 +158,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
|
|||||||
/** Args passed to the compiler at the second stage of two-stage compilation (producing a final binary from the klib). */
|
/** Args passed to the compiler at the second stage of two-stage compilation (producing a final binary from the klib). */
|
||||||
protected fun buildSecondStageArgs(klibPath: String) = mutableListOf<String>().apply {
|
protected fun buildSecondStageArgs(klibPath: String) = mutableListOf<String>().apply {
|
||||||
addArg("-output", artifact.canonicalPath)
|
addArg("-output", artifact.canonicalPath)
|
||||||
addArg("-produce", produce.name.toLowerCase())
|
addArg("-produce", produce.name.lowercase(Locale.getDefault()))
|
||||||
addArgIfNotNull("-entry", entryPoint)
|
addArgIfNotNull("-entry", entryPoint)
|
||||||
|
|
||||||
addAll(buildCommonArgs())
|
addAll(buildCommonArgs())
|
||||||
@@ -205,7 +207,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
|
|||||||
/** Args passed to the compiler if the two-stage compilation is disabled. */
|
/** Args passed to the compiler if the two-stage compilation is disabled. */
|
||||||
fun buildSingleStageArgs() = mutableListOf<String>().apply {
|
fun buildSingleStageArgs() = mutableListOf<String>().apply {
|
||||||
addArg("-output", artifact.canonicalPath)
|
addArg("-output", artifact.canonicalPath)
|
||||||
addArg("-produce", produce.name.toLowerCase())
|
addArg("-produce", produce.name.lowercase(Locale.getDefault()))
|
||||||
addArgIfNotNull("-entry", entryPoint)
|
addArgIfNotNull("-entry", entryPoint)
|
||||||
|
|
||||||
addAll(buildCommonArgs())
|
addAll(buildCommonArgs())
|
||||||
|
|||||||
Reference in New Issue
Block a user