diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeCommonizerToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeCommonizerToolRunner.kt index 985604a03f0..feea8716a49 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeCommonizerToolRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeCommonizerToolRunner.kt @@ -19,13 +19,10 @@ internal class KotlinNativeCommonizerToolRunner( ) : KotlinToolRunner(context) { class Settings( - @get:Input val kotlinPluginVersion: String, classpathProvider: () -> Set, - @get:Input val customJvmArgs: List ) { - @get:Classpath val classpath by lazy(classpathProvider) constructor(project: Project) : this( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt index 7335271668c..25dade31e23 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt @@ -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, - @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( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt index 92e85b8571f..101f6ebf74e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt @@ -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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index 214070f3cf3..f8bb1b91c86 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -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. diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt index 07288006ae3..78fc6980014 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt @@ -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() {