[Gradle] Remove necessary @Input's in K/Native tasks

^KT-43293
This commit is contained in:
Anton Lakotka
2022-06-27 15:10:39 +02:00
committed by Space
parent a815864017
commit f89b88d7c2
5 changed files with 5 additions and 22 deletions
@@ -19,13 +19,10 @@ internal class KotlinNativeCommonizerToolRunner(
) : KotlinToolRunner(context) {
class Settings(
@get:Input
val kotlinPluginVersion: String,
classpathProvider: () -> Set<File>,
@get:Input
val customJvmArgs: List<String>
) {
@get:Classpath
val classpath by lazy(classpathProvider)
constructor(project: Project) : this(
@@ -61,16 +61,10 @@ internal abstract class KotlinNativeToolRunner(
) : KotlinToolRunner(executionContext) {
class Settings(
@get:Input
val konanVersion: CompilerVersion,
@get:Input
val konanHome: String,
@get:InputFile
@get:PathSensitive(PathSensitivity.ABSOLUTE)
val konanPropertiesFile: File,
@get:Input
val jvmArgs: List<String>,
@get:Classpath
val classpath: FileCollection
) {
@@ -194,10 +188,7 @@ internal class KotlinNativeCompilerRunner(
executionContext: GradleExecutionContext
) : KotlinNativeToolRunner("konanc", settings.parent, executionContext) {
class Settings(
@get:Nested
val parent: KotlinNativeToolRunner.Settings,
@get:Input
val disableKonanDaemon: Boolean,
) {
constructor(project: Project) : this(
@@ -76,8 +76,7 @@ internal open class CInteropCommonizerTask
override val outputDirectory: File = project.buildDir.resolve("classes/kotlin/commonizer")
@get:Nested
internal val runnerSettings = KotlinNativeCommonizerToolRunner.Settings(project)
private val runnerSettings = KotlinNativeCommonizerToolRunner.Settings(project)
private val konanHome = project.file(project.konanHome)
private val commonizerLogLevel = project.commonizerLogLevel
@@ -389,8 +389,7 @@ constructor(
kotlinOptions.freeCompilerArgs + ((languageSettings as? DefaultLanguageSettingsBuilder)?.freeCompilerArgs ?: emptyList())
}
@get:Nested
internal val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
private val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
private val isAllowCommonizer: Boolean by lazy { project.isAllowCommonizer() }
override fun kotlinOptions(fn: KotlinCommonOptions.() -> Unit) {
@@ -483,8 +482,7 @@ constructor(
final override val compilation: KotlinNativeCompilation
get() = binary.compilation
@get:Nested
internal val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
private val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
init {
dependsOn(project.provider { compilation.compileKotlinTaskProvider })
@@ -1183,8 +1181,7 @@ open class CInteropProcess
val outputFile: File
get() = outputFileProvider.get()
@get:Nested
internal val runnerSettings = KotlinNativeToolRunner.Settings(project)
private val runnerSettings = KotlinNativeToolRunner.Settings(project)
// Inputs and outputs.
@@ -151,8 +151,7 @@ open class KotlinNativeLinkArtifactTask @Inject constructor(
return destinationDir.resolve(outFileName)
}
@get:Nested
internal val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
private val runnerSettings = KotlinNativeCompilerRunner.Settings(project)
@TaskAction
fun link() {