Fix warnings in buildSrc

This commit is contained in:
Alexander Udalov
2021-02-26 19:37:40 +01:00
parent 17a8d24a84
commit 3f16f84d0d
5 changed files with 20 additions and 19 deletions
@@ -19,18 +19,18 @@ package org.jetbrains.kotlin.gradle.plugin.konan
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.NamedDomainObjectFactory
import org.gradle.api.internal.CollectionCallbackActionDecorator
import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer
import org.gradle.api.internal.project.ProjectInternal
import org.gradle.internal.reflect.Instantiator
import org.gradle.util.ConfigureUtil
import kotlin.reflect.KClass
open class KonanArtifactContainer(val project: ProjectInternal)
: DefaultPolymorphicDomainObjectContainer<KonanBuildingConfig<*>>(
KonanBuildingConfig::class.java,
project.services.get(Instantiator::class.java)
open class KonanArtifactContainer(val project: ProjectInternal) : DefaultPolymorphicDomainObjectContainer<KonanBuildingConfig<*>>(
KonanBuildingConfig::class.java,
project.services.get(Instantiator::class.java),
CollectionCallbackActionDecorator.NOOP
) {
private inner class KonanBuildingConfigFactory<T: KonanBuildingConfig<*>>(val configClass: KClass<T>)
: NamedDomainObjectFactory<T> {
@@ -120,7 +120,7 @@ abstract class KonanBuildingConfig<T : KonanBuildingTask>(
init(this@KonanBuildingConfig, outputDescription.destinationDir, outputDescription.artifactName, target)
group = BasePlugin.BUILD_GROUP
description = generateTaskDescription(this)
} ?: throw Exception("Cannot create task for target: ${target.visibleName}")
}
private fun createAggregateTask(): TaskProvider<Task> =
project.tasks.register(generateAggregateTaskName()) {
@@ -328,9 +328,6 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
override fun apply(project: ProjectInternal) {
if (project == null) {
return
}
checkGradleVersion()
project.plugins.apply("base")
// Create necessary tasks and extensions.