Fix warnings in buildSrc
This commit is contained in:
@@ -31,13 +31,13 @@ internal val Project.kotlin: KotlinMultiplatformExtension
|
|||||||
get() = extensions.getByName("kotlin") as KotlinMultiplatformExtension
|
get() = extensions.getByName("kotlin") as KotlinMultiplatformExtension
|
||||||
|
|
||||||
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.macosX64: KotlinTargetPreset<*>
|
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.macosX64: KotlinTargetPreset<*>
|
||||||
get() = getByName(::macosX64.name) as KotlinTargetPreset<*>
|
get() = getByName(::macosX64.name)
|
||||||
|
|
||||||
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.linuxX64: KotlinTargetPreset<*>
|
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.linuxX64: KotlinTargetPreset<*>
|
||||||
get() = getByName(::linuxX64.name) as KotlinTargetPreset<*>
|
get() = getByName(::linuxX64.name)
|
||||||
|
|
||||||
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.mingwX64: KotlinTargetPreset<*>
|
internal val NamedDomainObjectCollection<KotlinTargetPreset<*>>.mingwX64: KotlinTargetPreset<*>
|
||||||
get() = getByName(::mingwX64.name) as KotlinTargetPreset<*>
|
get() = getByName(::mingwX64.name)
|
||||||
|
|
||||||
internal val NamedDomainObjectContainer<out KotlinCompilation<*>>.main: KotlinNativeCompilation
|
internal val NamedDomainObjectContainer<out KotlinCompilation<*>>.main: KotlinNativeCompilation
|
||||||
get() = getByName(::main.name) as KotlinNativeCompilation
|
get() = getByName(::main.name) as KotlinNativeCompilation
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ val Project.testTarget
|
|||||||
get() = findProperty("target") as KonanTarget
|
get() = findProperty("target") as KonanTarget
|
||||||
|
|
||||||
val Project.testTargetSuffix
|
val Project.testTargetSuffix
|
||||||
get() = (findProperty("target") as KonanTarget ?: HostManager.host).name.capitalize()
|
get() = (findProperty("target") as KonanTarget).name.capitalize()
|
||||||
|
|
||||||
val Project.verboseTest
|
val Project.verboseTest
|
||||||
get() = hasProperty("test_verbose")
|
get() = hasProperty("test_verbose")
|
||||||
@@ -117,12 +117,10 @@ fun File.dependencies() =
|
|||||||
|
|
||||||
|
|
||||||
fun Task.dependsOnPlatformLibs() {
|
fun Task.dependsOnPlatformLibs() {
|
||||||
val platformManager = project.project(":kotlin-native").platformManager
|
|
||||||
val target = project.testTarget ?: platformManager.hostPlatform.target
|
|
||||||
(this as? KonanTest)?.run {
|
(this as? KonanTest)?.run {
|
||||||
project.file(source).dependencies().forEach {
|
project.file(source).dependencies().forEach {
|
||||||
this.dependsOn(":kotlin-native:platformLibs:${target.name}-$it")
|
this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it")
|
||||||
//this.dependsOn(":kotlin-native:platformLibs:${target.name}-${it}Cache")
|
//this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-${it}Cache")
|
||||||
}
|
}
|
||||||
} ?: error("unsupported task : $this")
|
} ?: error("unsupported task : $this")
|
||||||
}
|
}
|
||||||
@@ -401,3 +399,9 @@ fun Project.buildStaticLibrary(cSources: Collection<File>, output: File, objDir:
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Workaround the deprecation warning from stdlib's appendln, which is reported because this module is compiled with API version 1.3.
|
||||||
|
internal fun StringBuilder.appendln(o: Any?) {
|
||||||
|
append(o)
|
||||||
|
append('\n')
|
||||||
|
}
|
||||||
|
|||||||
+5
-5
@@ -19,18 +19,18 @@ package org.jetbrains.kotlin.gradle.plugin.konan
|
|||||||
import groovy.lang.Closure
|
import groovy.lang.Closure
|
||||||
import org.gradle.api.Action
|
import org.gradle.api.Action
|
||||||
import org.gradle.api.NamedDomainObjectFactory
|
import org.gradle.api.NamedDomainObjectFactory
|
||||||
|
import org.gradle.api.internal.CollectionCallbackActionDecorator
|
||||||
import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer
|
import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer
|
||||||
import org.gradle.api.internal.project.ProjectInternal
|
import org.gradle.api.internal.project.ProjectInternal
|
||||||
import org.gradle.internal.reflect.Instantiator
|
import org.gradle.internal.reflect.Instantiator
|
||||||
import org.gradle.util.ConfigureUtil
|
import org.gradle.util.ConfigureUtil
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
open class KonanArtifactContainer(val project: ProjectInternal)
|
open class KonanArtifactContainer(val project: ProjectInternal) : DefaultPolymorphicDomainObjectContainer<KonanBuildingConfig<*>>(
|
||||||
: DefaultPolymorphicDomainObjectContainer<KonanBuildingConfig<*>>(
|
KonanBuildingConfig::class.java,
|
||||||
KonanBuildingConfig::class.java,
|
project.services.get(Instantiator::class.java),
|
||||||
project.services.get(Instantiator::class.java)
|
CollectionCallbackActionDecorator.NOOP
|
||||||
) {
|
) {
|
||||||
|
|
||||||
private inner class KonanBuildingConfigFactory<T: KonanBuildingConfig<*>>(val configClass: KClass<T>)
|
private inner class KonanBuildingConfigFactory<T: KonanBuildingConfig<*>>(val configClass: KClass<T>)
|
||||||
: NamedDomainObjectFactory<T> {
|
: NamedDomainObjectFactory<T> {
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -120,7 +120,7 @@ abstract class KonanBuildingConfig<T : KonanBuildingTask>(
|
|||||||
init(this@KonanBuildingConfig, outputDescription.destinationDir, outputDescription.artifactName, target)
|
init(this@KonanBuildingConfig, outputDescription.destinationDir, outputDescription.artifactName, target)
|
||||||
group = BasePlugin.BUILD_GROUP
|
group = BasePlugin.BUILD_GROUP
|
||||||
description = generateTaskDescription(this)
|
description = generateTaskDescription(this)
|
||||||
} ?: throw Exception("Cannot create task for target: ${target.visibleName}")
|
}
|
||||||
|
|
||||||
private fun createAggregateTask(): TaskProvider<Task> =
|
private fun createAggregateTask(): TaskProvider<Task> =
|
||||||
project.tasks.register(generateAggregateTaskName()) {
|
project.tasks.register(generateAggregateTaskName()) {
|
||||||
|
|||||||
-3
@@ -328,9 +328,6 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
|
|||||||
|
|
||||||
|
|
||||||
override fun apply(project: ProjectInternal) {
|
override fun apply(project: ProjectInternal) {
|
||||||
if (project == null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
checkGradleVersion()
|
checkGradleVersion()
|
||||||
project.plugins.apply("base")
|
project.plugins.apply("base")
|
||||||
// Create necessary tasks and extensions.
|
// Create necessary tasks and extensions.
|
||||||
|
|||||||
Reference in New Issue
Block a user