diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index c39061134e2..9c4e18a858e 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -136,7 +136,7 @@ private fun generateKotlinCommonToolOptions( apiSrcDir: File, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val commonInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerCommonToolOptions") + val commonInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinCommonCompilerToolOptions") val commonOptions = gradleOptions() val additionalOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, commonInterfaceFqName)) { @@ -188,7 +188,7 @@ private fun generateKotlinCommonOptions( commonToolGeneratedOptions: GeneratedOptions, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val commonCompilerInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerCommonOptions") + val commonCompilerInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinCommonCompilerOptions") val commonCompilerOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, commonCompilerInterfaceFqName)) { generateInterface( @@ -241,7 +241,7 @@ private fun generateKotlinJvmOptions( commonCompilerGeneratedOptions: GeneratedOptions, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val jvmInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerJvmOptions") + val jvmInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinJvmCompilerOptions") val jvmOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, jvmInterfaceFqName)) { generateInterface( @@ -292,7 +292,7 @@ private fun generateKotlinJsOptions( commonCompilerOptions: GeneratedOptions, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val jsInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerJsOptions") + val jsInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinJsCompilerOptions") val jsOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, jsInterfaceFqName)) { generateInterface( @@ -343,7 +343,7 @@ private fun generateJsDceOptions( commonToolOptions: GeneratedOptions, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val jsDceInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerJsDceOptions") + val jsDceInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinJsDceCompilerToolOptions") val jsDceOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, jsDceInterfaceFqName)) { generateInterface( @@ -394,7 +394,7 @@ private fun generateMultiplatformCommonOptions( commonCompilerOptions: GeneratedOptions, withPrinterToFile: (targetFile: File, Printer.() -> Unit) -> Unit ): GeneratedOptions { - val multiplatformCommonInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.CompilerMultiplatformCommonOptions") + val multiplatformCommonInterfaceFqName = FqName("$OPTIONS_PACKAGE_PREFIX.KotlinMultiplatformCommonCompilerOptions") val multiplatformCommonOptions = gradleOptions() withPrinterToFile(fileFromFqName(apiSrcDir, multiplatformCommonInterfaceFqName)) { generateInterface( @@ -565,7 +565,7 @@ private fun Printer.generateImpl( private fun Printer.addAdditionalJvmArgs(implType: FqName) { // Adding required 'noStdlib' and 'noReflect' compiler arguments for JVM compilation // Otherwise compilation via build tools will fail - if (implType.shortName().toString() == "CompilerJvmOptions$IMPLEMENTATION_SUFFIX") { + if (implType.shortName().toString() == "KotlinJvmCompilerOptions$IMPLEMENTATION_SUFFIX") { println() println("// Arguments with always default values when used from build tools") println("args.noStdlib = true") diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-api.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-api.txt index dc4bdeab763..fdea00704c2 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-api.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-api.txt @@ -1,46 +1,3 @@ -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions : org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions { - public abstract fun getApiVersion ()Lorg/gradle/api/provider/Property; - public abstract fun getLanguageVersion ()Lorg/gradle/api/provider/Property; - public abstract fun getUseK2 ()Lorg/gradle/api/provider/Property; -} - -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions { - public abstract fun getAllWarningsAsErrors ()Lorg/gradle/api/provider/Property; - public abstract fun getFreeCompilerArgs ()Lorg/gradle/api/provider/ListProperty; - public abstract fun getSuppressWarnings ()Lorg/gradle/api/provider/Property; - public abstract fun getVerbose ()Lorg/gradle/api/provider/Property; -} - -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions : org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions { - public abstract fun getDevMode ()Lorg/gradle/api/provider/Property; - public abstract fun getOutputDirectory ()Lorg/gradle/api/provider/Property; -} - -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerJsOptions : org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions { - public abstract fun getFriendModulesDisabled ()Lorg/gradle/api/provider/Property; - public abstract fun getMain ()Lorg/gradle/api/provider/Property; - public abstract fun getMetaInfo ()Lorg/gradle/api/provider/Property; - public abstract fun getModuleKind ()Lorg/gradle/api/provider/Property; - public abstract fun getModuleName ()Lorg/gradle/api/provider/Property; - public abstract fun getNoStdlib ()Lorg/gradle/api/provider/Property; - public abstract fun getOutputFile ()Lorg/gradle/api/provider/Property; - public abstract fun getSourceMap ()Lorg/gradle/api/provider/Property; - public abstract fun getSourceMapEmbedSources ()Lorg/gradle/api/provider/Property; - public abstract fun getSourceMapPrefix ()Lorg/gradle/api/provider/Property; - public abstract fun getTarget ()Lorg/gradle/api/provider/Property; - public abstract fun getTypedArrays ()Lorg/gradle/api/provider/Property; -} - -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions : org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions { - public abstract fun getJavaParameters ()Lorg/gradle/api/provider/Property; - public abstract fun getJvmTarget ()Lorg/gradle/api/provider/Property; - public abstract fun getModuleName ()Lorg/gradle/api/provider/Property; - public abstract fun getNoJdk ()Lorg/gradle/api/provider/Property; -} - -public abstract interface class org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions : org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions { -} - public final class org/jetbrains/kotlin/gradle/dsl/ExplicitApiMode : java/lang/Enum { public static final field Disabled Lorg/jetbrains/kotlin/gradle/dsl/ExplicitApiMode; public static final field Strict Lorg/jetbrains/kotlin/gradle/dsl/ExplicitApiMode; @@ -190,10 +147,23 @@ public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinArtifactsE public abstract fun getNative ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinNativeArtifactDSL; } +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions { + public abstract fun getApiVersion ()Lorg/gradle/api/provider/Property; + public abstract fun getLanguageVersion ()Lorg/gradle/api/provider/Property; + public abstract fun getUseK2 ()Lorg/gradle/api/provider/Property; +} + +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions { + public abstract fun getAllWarningsAsErrors ()Lorg/gradle/api/provider/Property; + public abstract fun getFreeCompilerArgs ()Lorg/gradle/api/provider/ListProperty; + public abstract fun getSuppressWarnings ()Lorg/gradle/api/provider/Property; + public abstract fun getVerbose ()Lorg/gradle/api/provider/Property; +} + public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions { public abstract fun getApiVersion ()Ljava/lang/String; public abstract fun getLanguageVersion ()Ljava/lang/String; - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions; public abstract fun getUseK2 ()Z public abstract fun setApiVersion (Ljava/lang/String;)V public abstract fun setLanguageVersion (Ljava/lang/String;)V @@ -220,7 +190,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions$DefaultIm public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions { public abstract fun getAllWarningsAsErrors ()Z public abstract fun getFreeCompilerArgs ()Ljava/util/List; - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions; public abstract fun getSuppressWarnings ()Z public abstract fun getVerbose ()Z public abstract fun setAllWarningsAsErrors (Z)V @@ -253,9 +223,29 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinCompile$DefaultImpls { public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/dsl/KotlinCompile;Lorg/gradle/api/Action;)V } +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions { + public abstract fun getFriendModulesDisabled ()Lorg/gradle/api/provider/Property; + public abstract fun getMain ()Lorg/gradle/api/provider/Property; + public abstract fun getMetaInfo ()Lorg/gradle/api/provider/Property; + public abstract fun getModuleKind ()Lorg/gradle/api/provider/Property; + public abstract fun getModuleName ()Lorg/gradle/api/provider/Property; + public abstract fun getNoStdlib ()Lorg/gradle/api/provider/Property; + public abstract fun getOutputFile ()Lorg/gradle/api/provider/Property; + public abstract fun getSourceMap ()Lorg/gradle/api/provider/Property; + public abstract fun getSourceMapEmbedSources ()Lorg/gradle/api/provider/Property; + public abstract fun getSourceMapPrefix ()Lorg/gradle/api/provider/Property; + public abstract fun getTarget ()Lorg/gradle/api/provider/Property; + public abstract fun getTypedArrays ()Lorg/gradle/api/provider/Property; +} + +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions { + public abstract fun getDevMode ()Lorg/gradle/api/provider/Property; + public abstract fun getOutputDirectory ()Lorg/gradle/api/provider/Property; +} + public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions { public abstract fun getDevMode ()Z - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptions; public abstract fun getOutputDirectory ()Ljava/lang/String; public abstract fun setDevMode (Z)V public abstract fun setOutputDirectory (Ljava/lang/String;)V @@ -283,7 +273,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions public abstract fun getModuleKind ()Ljava/lang/String; public abstract fun getModuleName ()Ljava/lang/String; public abstract fun getNoStdlib ()Z - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerJsOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions; public abstract fun getOutputFile ()Ljava/lang/String; public abstract fun getSourceMap ()Z public abstract fun getSourceMapEmbedSources ()Ljava/lang/String; @@ -345,12 +335,19 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions$DefaultImpls public static fun setVerbose (Lorg/jetbrains/kotlin/gradle/dsl/KotlinJsOptions;Z)V } +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions { + public abstract fun getJavaParameters ()Lorg/gradle/api/provider/Property; + public abstract fun getJvmTarget ()Lorg/gradle/api/provider/Property; + public abstract fun getModuleName ()Lorg/gradle/api/provider/Property; + public abstract fun getNoJdk ()Lorg/gradle/api/provider/Property; +} + public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions { public abstract fun getJavaParameters ()Z public abstract fun getJvmTarget ()Ljava/lang/String; public abstract fun getModuleName ()Ljava/lang/String; public abstract fun getNoJdk ()Z - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions; public abstract fun setJavaParameters (Z)V public abstract fun setJvmTarget (Ljava/lang/String;)V public abstract fun setModuleName (Ljava/lang/String;)V @@ -382,8 +379,11 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions$DefaultImpls public static fun setVerbose (Lorg/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions;Z)V } +public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions { +} + public abstract interface class org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions : org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions { - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptions; } public final class org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions$DefaultImpls { @@ -601,7 +601,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/FilesSubpluginOption : org public abstract interface class org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions { public abstract fun configure (Lkotlin/jvm/functions/Function1;)V public abstract fun configure (Lorg/gradle/api/Action;)V - public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions; + public abstract fun getOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions; } public final class org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions$DefaultImpls { @@ -878,7 +878,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeKt { public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinJvmFactory { public abstract fun addCompilerPluginDependency (Lorg/gradle/api/provider/Provider;)V - public abstract fun createCompilerJvmOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions; + public abstract fun createCompilerJvmOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions; public abstract fun createKotlinJvmOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions; public abstract fun getCompilerPlugins ()Lorg/gradle/api/file/FileCollection; public abstract fun getKaptExtension ()Lorg/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig; @@ -1394,7 +1394,7 @@ public final class org/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs$DefaultIm public abstract interface class org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask : org/gradle/api/Task { public abstract fun compilerOptions (Lkotlin/jvm/functions/Function1;)V public abstract fun compilerOptions (Lorg/gradle/api/Action;)V - public abstract fun getCompilerOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions; + public abstract fun getCompilerOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions; } public final class org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask$DefaultImpls { @@ -1458,7 +1458,7 @@ public final class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile$DefaultImp } public abstract interface class org/jetbrains/kotlin/gradle/tasks/KotlinToolTask : org/gradle/api/Task { - public abstract fun getToolOptions ()Lorg/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions; + public abstract fun getToolOptions ()Lorg/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions; public abstract fun toolOptions (Lkotlin/jvm/functions/Function1;)V public abstract fun toolOptions (Lorg/gradle/api/Action;)V } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt index 0dfc07d9d42..2afa9201807 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinArtifact.kt @@ -28,7 +28,7 @@ interface KotlinNativeArtifact : KotlinArtifact { replaceWith = ReplaceWith("toolOptionsConfigure") ) val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit - val toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit + val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit val binaryOptions: Map } @@ -70,7 +70,7 @@ interface KotlinNativeArtifactConfig : KotlinArtifactConfig { replaceWith = ReplaceWith("toolOptions(fn)") ) fun kotlinOptions(fn: Action) - fun toolOptions(configure: Action) + fun toolOptions(configure: Action) fun binaryOption(name: String, value: String) } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt index 31f55787f6d..e1bf6ca3e5e 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerCommonOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions { +interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions { /** * Allow using declarations only from the specified version of bundled libraries diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions.kt index 563ab9fd67c..f27a18e742a 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerCommonToolOptions { +interface KotlinCommonCompilerToolOptions { /** * Report an error if there are any warnings diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index e8ccdbebbaf..ff55c9675eb 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerCommonOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinCommonCompilerOptions instead", level = DeprecationLevel.WARNING) interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions { - override val options: org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions + override val options: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions private val kotlin.String?.apiVersionCompilerOption get() = if (this != null) org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion(this) else null diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt index 9c1e144e847..4db45bb148e 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerCommonToolOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinCommonCompilerToolOptions instead", level = DeprecationLevel.WARNING) interface KotlinCommonToolOptions { - val options: org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions + val options: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions /** * Report an error if there are any warnings diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt index 158c37a8426..3979e89f3d3 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerJsOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions { +interface KotlinJsCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions { /** * Disable internal declaration export diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptions.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptions.kt index dcdf8b643ef..090f90b3bfd 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerJsDceOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions { +interface KotlinJsDceCompilerToolOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions { /** * Development mode: don't strip out any code, just copy dependencies diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt index 25aa6487f9b..d48fe48a711 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerJsDceOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinJsDceCompilerToolOptions instead", level = DeprecationLevel.WARNING) interface KotlinJsDceOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions { - override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptions + override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions /** * Development mode: don't strip out any code, just copy dependencies diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt index b21ce833dc2..652138798c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerJsOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinJsCompilerOptions instead", level = DeprecationLevel.WARNING) interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { - override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions + override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions /** * Disable internal declaration export diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt index 7666cf18353..39217371f84 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerJvmOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions { +interface KotlinJvmCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions { /** * Generate metadata for Java 1.8 reflection on method parameters diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index 9985313ae8e..fa4f1985ca6 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerJvmOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinJvmCompilerOptions instead", level = DeprecationLevel.WARNING) interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { - override val options: org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions + override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions /** * Generate metadata for Java 1.8 reflection on method parameters diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptions.kt similarity index 71% rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptions.kt index 00e165021d7..83de1be9b61 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptions.kt @@ -5,5 +5,5 @@ package org.jetbrains.kotlin.gradle.dsl -interface CompilerMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions { +interface KotlinMultiplatformCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions { } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt index ac68f8c9914..7ed94e9eb18 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl -@Deprecated("Use CompilerMultiplatformCommonOptions instead", level = DeprecationLevel.WARNING) +@Deprecated("Use KotlinMultiplatformCommonCompilerOptions instead", level = DeprecationLevel.WARNING) interface KotlinMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { - override val options: org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions + override val options: org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions.kt index af153cf9ebc..abd37d7c4a0 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasCompilerOptions.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Action -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions -interface HasCompilerOptions { +interface HasCompilerOptions { val options: CO fun configure(configuration: CO.() -> Unit) { diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJvmFactory.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJvmFactory.kt index 4814c4d9676..4e8e38f5cbf 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJvmFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJvmFactory.kt @@ -9,7 +9,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.file.FileCollection import org.gradle.api.provider.Provider import org.gradle.api.tasks.TaskProvider -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KaptExtensionConfig import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptionsDeprecated import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtensionConfig @@ -36,7 +36,7 @@ interface KotlinJvmFactory { ) fun createKotlinJvmOptions(): KotlinJvmOptionsDeprecated - fun createCompilerJvmOptions(): CompilerJvmOptions + fun createCompilerJvmOptions(): KotlinJvmCompilerOptions /** Creates a Kotlin compile task. */ fun registerKotlinJvmCompileTask(taskName: String): TaskProvider diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt index 07b69a76516..99b6c85b370 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt @@ -10,7 +10,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.Project import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask.kt index 12d31c4889c..dd7a74a99f7 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.Action import org.gradle.api.Task import org.gradle.api.tasks.Nested -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions -interface KotlinCompilationTask : Task { +interface KotlinCompilationTask : Task { @get:Nested val compilerOptions: CO diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTaskConfigs.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTaskConfigs.kt index e575a36d0e7..6f7bf639931 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTaskConfigs.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTaskConfigs.kt @@ -79,7 +79,7 @@ interface BaseKotlinCompile : KotlinCompileTool { @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") interface KotlinJvmCompile : BaseKotlinCompile, KotlinCompileDeprecated, - KotlinCompilationTask { + KotlinCompilationTask { // JVM specific @get:Internal("Takes part in compiler args.") diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinToolTask.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinToolTask.kt index 2b1aef4978b..c9222a14269 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinToolTask.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinToolTask.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.Action import org.gradle.api.Task import org.gradle.api.tasks.Nested -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions -interface KotlinToolTask : Task { +interface KotlinToolTask : Task { @get:Nested val toolOptions: TO diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsDefault.kt similarity index 85% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsDefault.kt index 959b6a91115..42448f94c8f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerCommonOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinCommonCompilerOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions { override val apiVersion: org.gradle.api.provider.Property = objectFactory.property(org.jetbrains.kotlin.gradle.dsl.KotlinVersion::class.java) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsDefault.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsDefault.kt index fbf9bb03a46..a7c0f6f9ed8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerCommonToolOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerToolOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerCommonToolOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinCommonCompilerToolOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions { override val allWarningsAsErrors: org.gradle.api.provider.Property = objectFactory.property(kotlin.Boolean::class.java).convention(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsDefault.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsDefault.kt index a0721109715..507367635f3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsCompilerOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerJsOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinJsCompilerOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions { override val friendModulesDisabled: org.gradle.api.provider.Property = objectFactory.property(kotlin.Boolean::class.java).convention(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsDefault.kt similarity index 83% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsDefault.kt index a21dc009c27..c0005464b44 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJsDceOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceCompilerToolOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerJsDceOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinJsDceCompilerToolOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions { override val devMode: org.gradle.api.provider.Property = objectFactory.property(kotlin.Boolean::class.java).convention(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsDefault.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsDefault.kt index d484a3068c2..2024beebc67 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerJvmOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerJvmOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinJvmCompilerOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions { override val javaParameters: org.gradle.api.provider.Property = objectFactory.property(kotlin.Boolean::class.java).convention(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptionsDefault.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsDefault.kt similarity index 71% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptionsDefault.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsDefault.kt index 6fd63373309..ed4aa85b518 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/CompilerMultiplatformCommonOptionsDefault.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonCompilerOptionsDefault.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.dsl -internal abstract class CompilerMultiplatformCommonOptionsDefault @javax.inject.Inject constructor( +internal abstract class KotlinMultiplatformCommonCompilerOptionsDefault @javax.inject.Inject constructor( objectFactory: org.gradle.api.model.ObjectFactory -) : org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions { +) : org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault(objectFactory), org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions { internal fun fillCompilerArguments(args: org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments) { super.fillCompilerArguments(args) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt index dd711a106dd..8bbc8694df5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt @@ -164,27 +164,27 @@ abstract class KotlinSingleTargetExtension(project: Proje abstract class KotlinSingleJavaTargetExtension(project: Project) : KotlinSingleTargetExtension>(project) abstract class KotlinJvmProjectExtension(project: Project) : KotlinSingleJavaTargetExtension(project) { - override lateinit var target: KotlinWithJavaTarget + override lateinit var target: KotlinWithJavaTarget internal set - open fun target(body: KotlinWithJavaTarget.() -> Unit) = target.run(body) + open fun target(body: KotlinWithJavaTarget.() -> Unit) = target.run(body) } abstract class Kotlin2JsProjectExtension(project: Project) : KotlinSingleJavaTargetExtension(project) { - private lateinit var _target: KotlinWithJavaTarget + private lateinit var _target: KotlinWithJavaTarget - override val target: KotlinWithJavaTarget + override val target: KotlinWithJavaTarget get() { if (!::_target.isInitialized) throw IllegalStateException("Extension target is not initialized!") return _target } - internal fun setTarget(target: KotlinWithJavaTarget) { + internal fun setTarget(target: KotlinWithJavaTarget) { _target = target } - open fun target(body: KotlinWithJavaTarget.() -> Unit) = target.run(body) + open fun target(body: KotlinWithJavaTarget.() -> Unit) = target.run(body) } abstract class KotlinJsProjectExtension(project: Project) : @@ -381,11 +381,11 @@ abstract class KotlinJsProjectExtension(project: Project) : } abstract class KotlinCommonProjectExtension(project: Project) : KotlinSingleJavaTargetExtension(project) { - override lateinit var target: KotlinWithJavaTarget + override lateinit var target: KotlinWithJavaTarget internal set open fun target( - body: KotlinWithJavaTarget.() -> Unit + body: KotlinWithJavaTarget.() -> Unit ) = target.run(body) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt index 9b56d7a5be8..4d88ddc3430 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.internal import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompileArgumentsProvider @@ -77,7 +77,7 @@ internal open class KotlinJvmCompilerArgumentsContributor( args: K2JVMCompilerArguments, flags: Collection ) { - (compilerOptions as CompilerJvmOptionsDefault).fillDefaultValues(args) + (compilerOptions as KotlinJvmCompilerOptionsDefault).fillDefaultValues(args) super.contributeArguments(args, flags) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt index 24cb0831647..48e173be4bd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt @@ -25,7 +25,7 @@ import org.gradle.work.Incremental import org.gradle.work.NormalizeLineEndings import org.gradle.workers.WorkerExecutor import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault import org.jetbrains.kotlin.gradle.report.BuildReportMode import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -39,7 +39,7 @@ abstract class KaptGenerateStubsTask @Inject constructor( workerExecutor: WorkerExecutor, objectFactory: ObjectFactory ) : KotlinCompile( - objectFactory.newInstance(CompilerJvmOptionsDefault::class.java), + objectFactory.newInstance(KotlinJvmCompilerOptionsDefault::class.java), workerExecutor, objectFactory ), KaptGenerateStubs { @@ -110,7 +110,7 @@ abstract class KaptGenerateStubsTask @Inject constructor( // Also use KotlinOptions configuration that was directly set to this task // as 'compileKotlinArgumentsContributor' has KotlinOptions from linked KotlinCompile task - (compilerOptions as CompilerJvmOptionsDefault).fillCompilerArguments(args) + (compilerOptions as KotlinJvmCompilerOptionsDefault).fillCompilerArguments(args) // Copied from KotlinCompile if (reportingSettings().buildReportMode == BuildReportMode.VERBOSE) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt index 066445519cc..bbaf39fd1d6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinBaseApiPlugin.kt @@ -10,7 +10,6 @@ import org.gradle.api.file.FileCollection import org.gradle.api.provider.Provider import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.* -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask import org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask import org.jetbrains.kotlin.gradle.tasks.* @@ -42,15 +41,15 @@ abstract class KotlinBaseApiPlugin : DefaultKotlinBasePlugin(), KotlinJvmFactory return myProject.configurations.getByName(PLUGIN_CLASSPATH_CONFIGURATION_NAME) } - override fun createCompilerJvmOptions(): CompilerJvmOptions { - return myProject.objects.newInstance(CompilerJvmOptionsDefault::class.java) + override fun createCompilerJvmOptions(): KotlinJvmCompilerOptions { + return myProject.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } @Suppress("DEPRECATION") @Deprecated("Replaced by compilerJvmOptions", replaceWith = ReplaceWith("createCompilerJvmOptions()")) override fun createKotlinJvmOptions(): KotlinJvmOptions { return object : KotlinJvmOptions { - override val options: CompilerJvmOptions = createCompilerJvmOptions() + override val options: KotlinJvmCompilerOptions = createCompilerJvmOptions() } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 847874b2a00..fa9f682cb4a 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -179,7 +179,7 @@ internal class Kotlin2JvmSourceSetProcessor( return tasksProvider.registerKotlinJVMTask( project, taskName, - kotlinCompilation.compilerOptions.options as CompilerJvmOptions, + kotlinCompilation.compilerOptions.options as KotlinJvmCompilerOptions, configAction ) } @@ -241,7 +241,7 @@ internal class Kotlin2JsSourceSetProcessor( return tasksProvider.registerKotlinJSTask( project, taskName, - kotlinCompilation.compilerOptions.options as CompilerJsOptions, + kotlinCompilation.compilerOptions.options as KotlinJsCompilerOptions, configAction ) } @@ -278,7 +278,7 @@ internal class KotlinJsIrSourceSetProcessor( return tasksProvider.registerKotlinJSTask( project, taskName, - kotlinCompilation.compilerOptions.options as CompilerJsOptions, + kotlinCompilation.compilerOptions.options as KotlinJsCompilerOptions, configAction ) } @@ -340,7 +340,7 @@ internal class KotlinCommonSourceSetProcessor( return tasksProvider.registerKotlinCommonTask( project, taskName, - kotlinCompilation.compilerOptions.options as CompilerMultiplatformCommonOptions, + kotlinCompilation.compilerOptions.options as KotlinMultiplatformCommonCompilerOptions, configAction ) } @@ -594,17 +594,17 @@ internal open class KotlinPlugin( KotlinPlatformType.jvm, targetName, { - object : HasCompilerOptions { - override val options: CompilerJvmOptions = - project.objects.newInstance(CompilerJvmOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } }, - { compilerOptions: CompilerJvmOptions -> + { compilerOptions: KotlinJvmCompilerOptions -> object : KotlinJvmOptions { - override val options: CompilerJvmOptions get() = compilerOptions + override val options: KotlinJvmCompilerOptions get() = compilerOptions } } - ) as KotlinWithJavaTarget) + ) as KotlinWithJavaTarget) .apply { disambiguationClassifier = null // don't add anything to the task names } @@ -646,18 +646,18 @@ internal open class KotlinCommonPlugin( KotlinPlatformType.common, targetName, { - object : HasCompilerOptions { - override val options: CompilerMultiplatformCommonOptions = - project.objects.newInstance(CompilerMultiplatformCommonOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinMultiplatformCommonCompilerOptions = + project.objects.newInstance(KotlinMultiplatformCommonCompilerOptionsDefault::class.java) } }, - { compilerOptions: CompilerMultiplatformCommonOptions -> + { compilerOptions: KotlinMultiplatformCommonCompilerOptions -> object : KotlinMultiplatformCommonOptions { - override val options: CompilerMultiplatformCommonOptions + override val options: KotlinMultiplatformCommonCompilerOptions get() = compilerOptions } } - ) as KotlinWithJavaTarget + ) as KotlinWithJavaTarget (project.kotlinExtension as KotlinCommonProjectExtension).target = target super.apply(project) @@ -690,18 +690,18 @@ internal open class Kotlin2JsPlugin( KotlinPlatformType.js, targetName, { - object : HasCompilerOptions { - override val options: CompilerJsOptions = - project.objects.newInstance(CompilerJsOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJsCompilerOptions = + project.objects.newInstance(KotlinJsCompilerOptionsDefault::class.java) } }, - { compilerOptions: CompilerJsOptions -> + { compilerOptions: KotlinJsCompilerOptions -> object : KotlinJsOptions { - override val options: CompilerJsOptions + override val options: KotlinJsCompilerOptions get() = compilerOptions } } - ) as KotlinWithJavaTarget + ) as KotlinWithJavaTarget (project.kotlinExtension as Kotlin2JsProjectExtension).setTarget(target) super.apply(project) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index a112c7ff5c9..b354c90a21d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -68,7 +68,7 @@ interface CompilationDetailsWithRuntime : CompilationDe internal val CompilationDetails<*>.associateCompilationsClosure: Iterable> get() = closure { it.associateCompilations } -open class DefaultCompilationDetails( +open class DefaultCompilationDetails( final override val target: KotlinTarget, final override val compilationPurpose: String, defaultSourceSet: KotlinSourceSet, @@ -316,7 +316,7 @@ open class DefaultCompilationDetails( +open class DefaultCompilationDetailsWithRuntime( target: KotlinTarget, compilationPurpose: String, defaultSourceSet: KotlinSourceSet, @@ -339,10 +339,10 @@ open class NativeCompilationDetails( compilationPurpose: String, defaultSourceSet: KotlinSourceSet, @Suppress("DEPRECATION") - createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, + createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, @Suppress("DEPRECATION") - createKotlinOptions: DefaultCompilationDetails.() -> KotlinCommonOptions -) : DefaultCompilationDetails( + createKotlinOptions: DefaultCompilationDetails.() -> KotlinCommonOptions +) : DefaultCompilationDetails( target, compilationPurpose, defaultSourceSet, @@ -379,10 +379,10 @@ internal open class SharedNativeCompilationDetails( compilationPurpose: String, defaultSourceSet: KotlinSourceSet, @Suppress("DEPRECATION") - createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, + createCompilerOptions: DefaultCompilationDetails.() -> HasCompilerOptions, @Suppress("DEPRECATION") - createKotlinOptions: DefaultCompilationDetails.() -> KotlinCommonOptions -) : DefaultCompilationDetails( + createKotlinOptions: DefaultCompilationDetails.() -> KotlinCommonOptions +) : DefaultCompilationDetails( target, compilationPurpose, defaultSourceSet, @@ -478,7 +478,7 @@ internal open class VariantMappedCompilationDetailsWithRuntime( +internal class WithJavaCompilationDetails( target: KotlinTarget, compilationPurpose: String, defaultSourceSet: KotlinSourceSet, @@ -520,19 +520,19 @@ class AndroidCompilationDetails( val androidVariant: BaseVariant, /** Workaround mutual creation order: a compilation is not added to the target's compilations collection until some point, pass it here */ private val getCompilationInstance: () -> KotlinJvmAndroidCompilation -) : DefaultCompilationDetailsWithRuntime( +) : DefaultCompilationDetailsWithRuntime( target, compilationPurpose, defaultSourceSet, { - object : HasCompilerOptions { - override val options: CompilerJvmOptions = - target.project.objects.newInstance(CompilerJvmOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + target.project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } }, { object : KotlinJvmOptions { - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions get() = compilerOptions.options } } @@ -576,19 +576,19 @@ internal class MetadataCompilationDetails( target: KotlinTarget, name: String, defaultSourceSet: KotlinSourceSet, -) : DefaultCompilationDetails( +) : DefaultCompilationDetails( target, name, defaultSourceSet, { - object : HasCompilerOptions { - override val options: CompilerMultiplatformCommonOptions = - target.project.objects.newInstance(CompilerMultiplatformCommonOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinMultiplatformCommonCompilerOptions = + target.project.objects.newInstance(KotlinMultiplatformCommonCompilerOptionsDefault::class.java) } }, { object : KotlinMultiplatformCommonOptions { - override val options: CompilerMultiplatformCommonOptions + override val options: KotlinMultiplatformCommonCompilerOptions get() = compilerOptions.options } } @@ -606,19 +606,19 @@ internal open class JsCompilationDetails( target: KotlinTarget, compilationPurpose: String, defaultSourceSet: KotlinSourceSet, -) : DefaultCompilationDetailsWithRuntime( +) : DefaultCompilationDetailsWithRuntime( target, compilationPurpose, defaultSourceSet, { - object : HasCompilerOptions { - override val options: CompilerJsOptions = - target.project.objects.newInstance(CompilerJsOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJsCompilerOptions = + target.project.objects.newInstance(KotlinJsCompilerOptionsDefault::class.java) } }, { object : KotlinJsOptions { - override val options: CompilerJsOptions + override val options: KotlinJsCompilerOptions get() = compilerOptions.options } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt index 96b77b1ac13..0cefc6343f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilation.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.tasks.TaskProvider -import org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask @@ -31,8 +29,8 @@ abstract class KotlinCommonCompilation @Inject constructor( get() = super.compileKotlinTask as KotlinCompileCommon @Suppress("UNCHECKED_CAST") - override val compileTaskProvider: TaskProvider> - get() = super.compileTaskProvider as TaskProvider> + override val compileTaskProvider: TaskProvider> + get() = super.compileTaskProvider as TaskProvider> internal val isKlibCompilation: Boolean get() = target.project.isKotlinGranularMetadataEnabled && !forceCompilationToKotlinMetadata diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmJvmVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmJvmVariant.kt index b9f901f2e78..2115c8b022d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmJvmVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmJvmVariant.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.artifacts.Configuration -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName @@ -42,17 +40,17 @@ abstract class GradleKpmJvmVariant @Inject constructor( class GradleKpmJvmVariantCompilationData(val variant: GradleKpmJvmVariant) : GradleKpmVariantCompilationDataInternal { override val owner: GradleKpmJvmVariant get() = variant - override val compilerOptions: HasCompilerOptions = - object : HasCompilerOptions { - override val options: CompilerJvmOptions = - variant.project.objects.newInstance(CompilerJvmOptionsDefault::class.java) + override val compilerOptions: HasCompilerOptions = + object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + variant.project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } // TODO pull out to the variant @Suppress("DEPRECATION") @Deprecated("Replaced with compilerOptions.options", replaceWith = ReplaceWith("compilerOptions.options")) override val kotlinOptions: KotlinJvmOptions = object : KotlinJvmOptions { - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions get() = compilerOptions.options } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt index f27e85e3a68..673db25a1fb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmNativeVariantCompilationData.kt @@ -6,8 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.targets.native.NativeCompilerOptions import org.jetbrains.kotlin.konan.target.KonanTarget @@ -29,7 +28,7 @@ internal class GradleKpmNativeVariantCompilationData( override val owner: GradleKpmNativeVariant get() = variant - override val compilerOptions: HasCompilerOptions = NativeCompilerOptions( + override val compilerOptions: HasCompilerOptions = NativeCompilerOptions( project, variant.languageSettings ) @@ -37,7 +36,7 @@ internal class GradleKpmNativeVariantCompilationData( @Suppress("DEPRECATION") @Deprecated("Replaced with compilerOptions.options", replaceWith = ReplaceWith("compilerOptions.options")) override val kotlinOptions: KotlinCommonOptions = object : KotlinCommonOptions { - override val options: CompilerCommonOptions + override val options: KotlinCommonCompilerOptions get() = compilerOptions.options } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt index fd06f841616..53f2e82b1b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt @@ -128,17 +128,17 @@ internal open class KotlinCommonFragmentMetadataCompilationDataImpl( mapTo(hashSetOf()) { it.platformType }.size > 1 } - override val compilerOptions: HasCompilerOptions = - object : HasCompilerOptions { - override val options: CompilerMultiplatformCommonOptions = - project.objects.newInstance(CompilerMultiplatformCommonOptionsDefault::class.java) + override val compilerOptions: HasCompilerOptions = + object : HasCompilerOptions { + override val options: KotlinMultiplatformCommonCompilerOptions = + project.objects.newInstance(KotlinMultiplatformCommonCompilerOptionsDefault::class.java) } @Suppress("DEPRECATION") @Deprecated("Replaced with compilerOptions.options", replaceWith = ReplaceWith("compilerOptions.options")) override val kotlinOptions: KotlinMultiplatformCommonOptions = object : KotlinMultiplatformCommonOptions { - override val options: CompilerMultiplatformCommonOptions + override val options: KotlinMultiplatformCommonCompilerOptions get() = compilerOptions.options } } @@ -177,7 +177,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl( override val isActive: Boolean get() = fragment.isNativeShared() && fragment.containingVariants.count() > 1 - override val compilerOptions: HasCompilerOptions = NativeCompilerOptions( + override val compilerOptions: HasCompilerOptions = NativeCompilerOptions( project, languageSettings ) @@ -185,7 +185,7 @@ internal open class KotlinNativeFragmentMetadataCompilationDataImpl( @Suppress("DEPRECATION") @Deprecated("Replaced with compilerOptions.options", replaceWith = ReplaceWith("compilerOptions.options")) override val kotlinOptions: KotlinCommonOptions = object : KotlinCommonOptions { - override val options: CompilerCommonOptions + override val options: KotlinCommonCompilerOptions get() = compilerOptions.options } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt index 24633c9fe96..71c2d16ade9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt @@ -11,7 +11,7 @@ import org.gradle.api.provider.Provider import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService @@ -102,7 +102,7 @@ internal class DefaultLanguageSettingsBuilder : LanguageSettingsBuilder { internal fun applyLanguageSettingsToCompilerOptions( languageSettingsBuilder: LanguageSettings, - compilerOptions: CompilerCommonOptions + compilerOptions: KotlinCommonCompilerOptions ) = with(compilerOptions) { languageVersion.convention(languageSettingsBuilder.languageVersion?.let { KotlinVersion.fromVersion(it) }) apiVersion.convention(languageSettingsBuilder.apiVersion?.let { KotlinVersion.fromVersion(it) }) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt index b453fc9f2a3..66bb2e63463 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt @@ -62,10 +62,10 @@ internal class AndroidProjectHandler( applyKotlinAndroidSourceSetLayout(kotlinAndroidTarget) - val androidExtensionCompilerOptions = project.objects.newInstance() + val androidExtensionCompilerOptions = project.objects.newInstance() androidExtensionCompilerOptions.noJdk.value(true).finalizeValueOnRead() @Suppress("DEPRECATION") val kotlinOptions = object : KotlinJvmOptions { - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions get() = androidExtensionCompilerOptions } ext.addExtension(KOTLIN_OPTIONS_DSL_NAME, kotlinOptions) @@ -89,7 +89,7 @@ internal class AndroidProjectHandler( setUpDependencyResolution(variant, compilation) project.wireExtensionOptionsToCompilation( androidExtensionCompilerOptions, - compilation.compilerOptions.options as CompilerJvmOptions + compilation.compilerOptions.options as KotlinJvmCompilerOptions ) preprocessVariant(variant, compilation, project, kotlinConfigurationTools.kotlinTasksProvider) @@ -119,8 +119,8 @@ internal class AndroidProjectHandler( } private fun Project.wireExtensionOptionsToCompilation( - extensionCompilerOptions: CompilerJvmOptions, - compilationCompilerOptions: CompilerJvmOptions + extensionCompilerOptions: KotlinJvmCompilerOptions, + compilationCompilerOptions: KotlinJvmCompilerOptions ) { // CompilerCommonToolOptions compilationCompilerOptions.allWarningsAsErrors.convention(extensionCompilerOptions.allWarningsAsErrors) @@ -237,7 +237,7 @@ internal class AndroidProjectHandler( tasksProvider.registerKotlinJVMTask( project, compilation.compileKotlinTaskName, - compilation.compilerOptions.options as CompilerJvmOptions, + compilation.compilerOptions.options as KotlinJvmCompilerOptions, configAction ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt index 7d4d2b070fb..79235068fbd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt @@ -10,8 +10,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import groovy.lang.Closure import org.gradle.api.tasks.TaskProvider -import org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources import org.jetbrains.kotlin.gradle.plugin.KotlinTarget @@ -22,7 +21,6 @@ import org.jetbrains.kotlin.gradle.targets.js.ir.JsBinary import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsBinaryContainer import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile -import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import javax.inject.Inject abstract class KotlinJsCompilation @Inject internal constructor( @@ -33,8 +31,8 @@ abstract class KotlinJsCompilation @Inject internal constructor( final override val target: KotlinTarget get() = super.target @Suppress("UNCHECKED_CAST") - final override val compilerOptions: HasCompilerOptions - get() = super.compilerOptions as HasCompilerOptions + final override val compilerOptions: HasCompilerOptions + get() = super.compilerOptions as HasCompilerOptions private val kotlinProperties = PropertiesProvider(target.project) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index 0b02a4f6469..0bf5783039f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -15,7 +15,7 @@ import org.gradle.workers.WorkerExecutor import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments import org.jetbrains.kotlin.compilerRunner.ArgumentUtils -import org.jetbrains.kotlin.gradle.dsl.CompilerJsOptionsDefault +import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptionsDefault import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode.DEVELOPMENT import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile -import org.jetbrains.kotlin.gradle.utils.getValue import org.jetbrains.kotlin.gradle.utils.toHexString import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import org.jetbrains.kotlin.statistics.metrics.StringMetrics @@ -38,7 +37,7 @@ abstract class KotlinJsIrLink @Inject constructor( objectFactory: ObjectFactory, workerExecutor: WorkerExecutor ) : Kotlin2JsCompile( - objectFactory.newInstance(CompilerJsOptionsDefault::class.java), + objectFactory.newInstance(KotlinJsCompilerOptionsDefault::class.java), objectFactory, workerExecutor ) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index b0d7ef5a10d..bb01f4e8881 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.ir import org.gradle.api.attributes.Usage import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.Zip -import org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.JsModuleKind import org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode import org.jetbrains.kotlin.gradle.plugin.* @@ -89,7 +89,7 @@ open class KotlinJsIrTargetConfigurator() : } } - private fun CompilerJsOptions.configureOptions() { + private fun KotlinJsCompilerOptions.configureOptions() { moduleKind.set(JsModuleKind.MODULE_UMD) sourceMap.set(true) sourceMapEmbedSources.set(JsSourceMapEmbedMode.SOURCE_MAP_SOURCE_CONTENT_NEVER) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt index 2bd13a3f01c..296fb9d3c42 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt @@ -11,8 +11,7 @@ import org.gradle.api.file.FileCollection import org.gradle.api.provider.Property import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.compile.JavaCompile -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.getJavaTaskProvider import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import javax.inject.Inject @@ -37,8 +36,8 @@ abstract class KotlinJvmAndroidCompilation @Inject constructor( get() = super.compileKotlinTaskProvider as TaskProvider @Suppress("UNCHECKED_CAST") - override val compileTaskProvider: TaskProvider> - get() = super.compileTaskProvider as TaskProvider> + override val compileTaskProvider: TaskProvider> + get() = super.compileTaskProvider as TaskProvider> val compileJavaTaskProvider: TaskProvider get() = androidVariant.getJavaTaskProvider() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt index 44871f63ff3..8b31d2b9eb1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt @@ -8,8 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.TaskProvider -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources import org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessor @@ -25,8 +24,8 @@ abstract class KotlinJvmCompilation @Inject constructor( override val target: KotlinJvmTarget get() = compilationDetails.target as KotlinJvmTarget @Suppress("UNCHECKED_CAST") - override val compilerOptions: HasCompilerOptions - get() = super.compilerOptions as HasCompilerOptions + override val compilerOptions: HasCompilerOptions + get() = super.compilerOptions as HasCompilerOptions override val processResourcesTaskName: String get() = disambiguateName("processResources") @@ -42,8 +41,8 @@ abstract class KotlinJvmCompilation @Inject constructor( get() = super.compileKotlinTask as org.jetbrains.kotlin.gradle.tasks.KotlinCompile @Suppress("UNCHECKED_CAST") - override val compileTaskProvider: TaskProvider> - get() = super.compileTaskProvider as TaskProvider> + override val compileTaskProvider: TaskProvider> + get() = super.compileTaskProvider as TaskProvider> val compileJavaTaskProvider: TaskProvider? get() = if (target.withJavaEnabled) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt index d494220ab02..fca0fd8ee11 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt @@ -6,9 +6,7 @@ @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility package org.jetbrains.kotlin.gradle.plugin.mpp -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget @@ -22,19 +20,19 @@ open class KotlinJvmCompilationFactory( override fun create(name: String): KotlinJvmCompilation = target.project.objects.newInstance( KotlinJvmCompilation::class.java, - DefaultCompilationDetailsWithRuntime( + DefaultCompilationDetailsWithRuntime( target, name, getOrCreateDefaultSourceSet(name), { - object : HasCompilerOptions { - override val options: CompilerJvmOptions = - target.project.objects.newInstance(CompilerJvmOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + target.project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } }, { object : KotlinJvmOptions { - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions get() = compilerOptions.options } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt index 96cf42c3eb4..1e0957abbea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmWithJavaTargetPreset.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project import org.gradle.api.plugins.JavaPlugin -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider @@ -18,11 +16,11 @@ import org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild class KotlinJvmWithJavaTargetPreset( private val project: Project -) : KotlinTargetPreset> { +) : KotlinTargetPreset> { override fun getName(): String = PRESET_NAME - override fun createTarget(name: String): KotlinWithJavaTarget { + override fun createTarget(name: String): KotlinWithJavaTarget { SingleWarningPerBuild.show( project, DEPRECATION_WARNING @@ -37,18 +35,18 @@ class KotlinJvmWithJavaTargetPreset( KotlinPlatformType.jvm, name, { - object : HasCompilerOptions { - override val options: CompilerJvmOptions = - project.objects.newInstance(CompilerJvmOptionsDefault::class.java) + object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) } }, - { compilerOptions: CompilerJvmOptions -> + { compilerOptions: KotlinJvmCompilerOptions -> object : KotlinJvmOptions { - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions get() = compilerOptions } } - ) as KotlinWithJavaTarget) + ) as KotlinWithJavaTarget) .apply { disambiguationClassifier = name preset = this@KotlinJvmWithJavaTargetPreset diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt index 3d2e7e416fd..d5089bb8325 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilation.kt @@ -9,8 +9,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.compile.JavaCompile -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationWithResources import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet @@ -18,7 +17,7 @@ import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.utils.named import javax.inject.Inject -abstract class KotlinWithJavaCompilation @Inject constructor( +abstract class KotlinWithJavaCompilation @Inject constructor( target: KotlinWithJavaTarget, name: String, override val defaultSourceSet: KotlinSourceSet, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt index 6e391156502..38e9457fd50 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt @@ -6,11 +6,10 @@ @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility package org.jetbrains.kotlin.gradle.plugin.mpp -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions -class KotlinWithJavaCompilationFactory( +class KotlinWithJavaCompilationFactory( override val target: KotlinWithJavaTarget, val compilerOptionsFactory: () -> HasCompilerOptions, val kotlinOptionsFactory: (CO) -> KotlinOptionsType diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt index 3bae2c5923b..fcf13a89f93 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt @@ -13,15 +13,14 @@ import org.gradle.api.file.Directory import org.gradle.api.plugins.JavaPlugin import org.gradle.api.provider.Provider import org.gradle.jvm.tasks.Jar -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.tasks.KOTLIN_BUILD_DIR_NAME import java.io.File import javax.inject.Inject -abstract class KotlinWithJavaTarget @Inject constructor( +abstract class KotlinWithJavaTarget @Inject constructor( project: Project, override val platformType: KotlinPlatformType, override val targetName: String, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt index 7db3c90ae6f..c5a92390903 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt @@ -6,8 +6,7 @@ @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility package org.jetbrains.kotlin.gradle.plugin.mpp -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.targets.native.NativeCompilerOptions import org.jetbrains.kotlin.konan.target.KonanTarget @@ -41,7 +40,7 @@ open class KotlinNativeCompilationFactory( }, { object : KotlinCommonOptions { - override val options: CompilerCommonOptions + override val options: KotlinCommonCompilerOptions get() = compilerOptions.options } } @@ -74,7 +73,7 @@ class KotlinSharedNativeCompilationFactory( }, { object : KotlinCommonOptions { - override val options: CompilerCommonOptions + override val options: KotlinCommonCompilerOptions get() = compilerOptions.options } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt index 4609bba834b..6302c25f941 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.gradle.targets.native import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptionsDefault +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptionsDefault import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.runOnceAfterEvaluated import org.jetbrains.kotlin.gradle.plugin.sources.applyLanguageSettingsToCompilerOptions @@ -16,9 +16,9 @@ import org.jetbrains.kotlin.project.model.LanguageSettings internal class NativeCompilerOptions( project: Project, nativeLanguageSettings: LanguageSettings -) : HasCompilerOptions { - override val options: CompilerCommonOptions = project.objects - .newInstance(CompilerCommonOptionsDefault::class.java) +) : HasCompilerOptions { + override val options: KotlinCommonCompilerOptions = project.objects + .newInstance(KotlinCommonCompilerOptionsDefault::class.java) .apply { useK2.finalizeValue() project.runOnceAfterEvaluated("apply Kotlin native properties from language settings") { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt index 38ea0466723..6e2349be7ac 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.gradle.targets.native.tasks import org.gradle.api.file.FileCollection import org.gradle.api.file.FileTree -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions import org.jetbrains.kotlin.konan.target.CompilerOutputKind @@ -35,7 +35,7 @@ internal fun buildKotlinNativeKlibCompilerArgs( languageSettings: LanguageSettings, enableEndorsedLibs: Boolean, - compilerOptions: CompilerCommonOptions, + compilerOptions: KotlinCommonCompilerOptions, compilerPlugins: List, moduleName: String, @@ -81,7 +81,7 @@ internal fun buildKotlinNativeBinaryLinkerArgs( friendModules: List, enableEndorsedLibs: Boolean, - toolOptions: CompilerCommonToolOptions, + toolOptions: KotlinCommonCompilerToolOptions, compilerPlugins: List, processTests: Boolean, @@ -138,7 +138,7 @@ private fun buildKotlinNativeMainArgs( internal fun buildKotlinNativeCompileCommonArgs( enableEndorsedLibs: Boolean, languageSettings: LanguageSettings, - compilerOptions: CompilerCommonOptions, + compilerOptions: KotlinCommonCompilerOptions, compilerPlugins: List ): List = mutableListOf().apply { add("-Xmulti-platform") @@ -166,7 +166,7 @@ internal fun buildKotlinNativeCompileCommonArgs( internal fun buildKotlinNativeCommonArgs( enableEndorsedLibs: Boolean, - toolOptions: CompilerCommonToolOptions, + toolOptions: KotlinCommonCompilerToolOptions, compilerPlugins: List ): List = mutableListOf().apply { add("-Xmulti-platform") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt index 3e383cd5faa..9c88c00b6f6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt @@ -21,10 +21,7 @@ import org.gradle.process.ExecOperations import org.jetbrains.kotlin.compilerRunner.KotlinNativeCompilerRunner import org.jetbrains.kotlin.compilerRunner.KotlinToolRunner import org.jetbrains.kotlin.compilerRunner.getKonanCacheKind -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.cocoapods.asValidFrameworkName import org.jetbrains.kotlin.gradle.plugin.mpp.* @@ -50,7 +47,7 @@ constructor( private val objectFactory: ObjectFactory, private val execOperations: ExecOperations ) : AbstractKotlinCompileTool(objectFactory), - KotlinToolTask { + KotlinToolTask { @Deprecated("Visibility will be lifted to private in the future releases") @get:Internal val compilation: KotlinNativeCompilation @@ -58,8 +55,8 @@ constructor( private val runnerSettings = KotlinNativeCompilerRunner.Settings.fromProject(project) - final override val toolOptions: CompilerCommonToolOptions = objectFactory - .newInstance() + final override val toolOptions: KotlinCommonCompilerToolOptions = objectFactory + .newInstance() .apply { freeCompilerArgs.addAll(PropertiesProvider(project).nativeLinkArgs) } @@ -137,7 +134,7 @@ constructor( ) @get:Internal val kotlinOptions: KotlinCommonToolOptions = object : KotlinCommonToolOptions { - override val options: CompilerCommonToolOptions + override val options: KotlinCommonCompilerToolOptions get() = toolOptions } 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 150090cea39..0e3779f9b58 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 @@ -306,7 +306,7 @@ constructor( private val execOperations: ExecOperations ) : AbstractKotlinNativeCompile, StubK2NativeCompilerArguments>(objectFactory), KotlinCompile, - KotlinCompilationTask { + KotlinCompilationTask { @get:Input override val outputKind = LIBRARY @@ -373,7 +373,7 @@ constructor( // endregion. // region Kotlin options. - override val compilerOptions: CompilerCommonOptions = compilation.compilerOptions.options + override val compilerOptions: KotlinCommonCompilerOptions = compilation.compilerOptions.options @Deprecated( message = "Replaced with compilerOptions", @@ -381,7 +381,7 @@ constructor( ) @Suppress("DEPRECATION") override val kotlinOptions: KotlinCommonOptions = object : KotlinCommonOptions { - override val options: CompilerCommonOptions + override val options: KotlinCommonCompilerOptions get() = compilerOptions } @@ -678,7 +678,7 @@ internal class CacheBuilder( val gradleUserHomeDir: File, val binary: NativeBinary, val konanTarget: KonanTarget, - val toolOptions: CompilerCommonToolOptions, + val toolOptions: KotlinCommonCompilerToolOptions, val externalDependenciesArgs: List ) { val rootCacheDirectory get() = getRootCacheDirectory( @@ -693,7 +693,7 @@ internal class CacheBuilder( project: Project, binary: NativeBinary, konanTarget: KonanTarget, - toolOptions: CompilerCommonToolOptions, + toolOptions: KotlinCommonCompilerToolOptions, externalDependenciesArgs: List ): Settings { val konanCacheKind = project.getKonanCacheKind(konanTarget) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifact.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifact.kt index 377c1cfd157..62048618760 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifact.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinArtifact.kt @@ -8,10 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.native.tasks.artifact import org.gradle.api.Action import org.gradle.api.Project import org.gradle.api.attributes.Usage -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactConfig -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeArtifactConfig +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages @@ -49,8 +46,8 @@ abstract class KotlinNativeArtifactConfigImpl(artifactName: String) : KotlinArti override var isStatic: Boolean = false override var linkerOptions: List = emptyList() - internal var toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit = {} - override fun toolOptions(configure: Action) { + internal var toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit = {} + override fun toolOptions(configure: Action) { toolOptionsConfigure = configure::execute } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt index df1b90a37ae..3d91011e1fb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFatFramework.kt @@ -9,10 +9,7 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.plugins.ExtensionAware import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeFatFramework -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeFatFrameworkConfig +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind @@ -73,7 +70,7 @@ class KotlinNativeFatFrameworkImpl( @Suppress("DEPRECATION") @Deprecated("Replaced by toolOptionsConfigure", replaceWith = ReplaceWith("toolOptionsConfigure")) override val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit, - override val toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit, + override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit, override val binaryOptions: Map, override val targets: Set, override val embedBitcode: BitcodeEmbeddingMode?, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFramework.kt index 4caf3baa6f7..661992e55f9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFramework.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeFramework.kt @@ -63,7 +63,7 @@ class KotlinNativeFrameworkImpl( @Suppress("DEPRECATION") @Deprecated("Replaced by compilerOptionsConfigure", replaceWith = ReplaceWith("compilerOptionsConfigure")) override val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit, - override val toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit, + override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit, override val binaryOptions: Map, override val target: KonanTarget, override val embedBitcode: BitcodeEmbeddingMode?, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLibrary.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLibrary.kt index 592aec5b871..766df6f6999 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLibrary.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLibrary.kt @@ -10,10 +10,7 @@ import org.gradle.api.Task import org.gradle.api.plugins.BasePlugin import org.gradle.api.plugins.ExtensionAware import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeLibrary -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeLibraryConfig +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind import org.jetbrains.kotlin.gradle.plugin.mpp.enabledOnCurrentHost @@ -62,7 +59,7 @@ class KotlinNativeLibraryImpl( @Suppress("DEPRECATION") @Deprecated("Replaced by compilerOptionsConfigure", replaceWith = ReplaceWith("compilerOptionsConfigure")) override val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit, - override val toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit, + override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit, override val binaryOptions: Map, override val target: KonanTarget, extensions: ExtensionAware 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 d059d20a7a2..03955d14405 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 @@ -20,9 +20,7 @@ import org.gradle.api.tasks.* import org.gradle.process.ExecOperations import org.jetbrains.kotlin.compilerRunner.KotlinNativeCompilerRunner import org.jetbrains.kotlin.compilerRunner.KotlinToolRunner -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode @@ -43,7 +41,7 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor( private val execOperations: ExecOperations, private val projectLayout: ProjectLayout ) : DefaultTask(), - KotlinToolTask { + KotlinToolTask { @get:Input abstract val baseName: Property @@ -94,8 +92,8 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor( @get:Input internal val allBinaryOptions: Provider> = binaryOptions.map { it + nativeBinaryOptions } - override val toolOptions: CompilerCommonToolOptions = objectFactory - .newInstance() + override val toolOptions: KotlinCommonCompilerToolOptions = objectFactory + .newInstance() .apply { freeCompilerArgs.addAll(PropertiesProvider(project).nativeLinkArgs) } @@ -107,7 +105,7 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor( ) @get:Internal val kotlinOptions = object : KotlinCommonToolOptions { - override val options: CompilerCommonToolOptions + override val options: KotlinCommonCompilerToolOptions get() = toolOptions } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt index ee6a342a455..2c9492aba8b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeXCFramework.kt @@ -9,10 +9,7 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.plugins.ExtensionAware import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.dsl.CompilerCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeXCFramework -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeXCFrameworkConfig +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind @@ -73,7 +70,7 @@ class KotlinNativeXCFrameworkImpl( @Suppress("DEPRECATION") @Deprecated("Replaced by toolOptionsConfigure", replaceWith = ReplaceWith("toolOptionsConfigure")) override val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit, - override val toolOptionsConfigure: CompilerCommonToolOptions.() -> Unit, + override val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit, override val binaryOptions: Map, override val targets: Set, override val embedBitcode: BitcodeEmbeddingMode?, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt index ca6bf218acd..a3cc28636cc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt @@ -35,11 +35,11 @@ import javax.inject.Inject @CacheableTask abstract class KotlinCompileCommon @Inject constructor( - override val compilerOptions: CompilerMultiplatformCommonOptions, + override val compilerOptions: KotlinMultiplatformCommonCompilerOptions, workerExecutor: WorkerExecutor, objectFactory: ObjectFactory ) : AbstractKotlinCompile(objectFactory, workerExecutor), - KotlinCompilationTask, + KotlinCompilationTask, KotlinCommonCompile { init { @@ -67,7 +67,7 @@ abstract class KotlinCompileCommon @Inject constructor( K2MetadataCompilerArguments() override fun setupCompilerArgs(args: K2MetadataCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) { - (compilerOptions as CompilerMultiplatformCommonOptionsDefault).fillDefaultValues(args) + (compilerOptions as KotlinMultiplatformCommonCompilerOptionsDefault).fillDefaultValues(args) super.setupCompilerArgs(args, defaultsOnly = defaultsOnly, ignoreClasspathResolutionErrors = ignoreClasspathResolutionErrors) args.moduleName = this@KotlinCompileCommon.moduleName.get() @@ -88,7 +88,7 @@ abstract class KotlinCompileCommon @Inject constructor( refinesPaths = refinesMetadataPaths.map { it.absolutePath }.toTypedArray() } - (compilerOptions as CompilerMultiplatformCommonOptionsDefault).fillCompilerArguments(args) + (compilerOptions as KotlinMultiplatformCommonCompilerOptionsDefault).fillCompilerArguments(args) if (additionalFreeCompilerArgs.isNotEmpty()) { args.freeArgs = compilerOptions.freeCompilerArgs.get().union(additionalFreeCompilerArgs).toList() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt index 960489cb9f7..e53319163eb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments import org.jetbrains.kotlin.cli.js.dce.K2JSDce import org.jetbrains.kotlin.compilerRunner.runToolInSeparateProcess -import org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerJsDceOptionsDefault +import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptionsDefault import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger @@ -43,7 +43,7 @@ import javax.inject.Inject abstract class KotlinJsDce @Inject constructor( objectFactory: ObjectFactory ) : AbstractKotlinCompileTool(objectFactory), - KotlinToolTask, + KotlinToolTask, KotlinJsDce { init { @@ -53,12 +53,12 @@ abstract class KotlinJsDce @Inject constructor( include("js".fileExtensionCasePermutations().map { "**/*.$it" }) } - override val toolOptions: CompilerJsDceOptions = objectFactory.newInstance() + override val toolOptions: KotlinJsDceCompilerToolOptions = objectFactory.newInstance() override fun createCompilerArgs(): K2JSDceArguments = K2JSDceArguments() override fun setupCompilerArgs(args: K2JSDceArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) { - (toolOptions as CompilerJsDceOptionsDefault).fillCompilerArguments(args) + (toolOptions as KotlinJsDceCompilerToolOptionsDefault).fillCompilerArguments(args) args.declarationsToKeep = keep.toTypedArray() } @@ -70,7 +70,7 @@ abstract class KotlinJsDce @Inject constructor( @Suppress("DEPRECATION") @get:Internal override val dceOptions: KotlinJsDceOptions = object : KotlinJsDceOptions { - override val options: CompilerJsDceOptions + override val options: KotlinJsDceCompilerToolOptions get() = toolOptions } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index ec575cb1fd3..57632cf9b38 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -524,7 +524,7 @@ class KotlinJvmCompilerArgumentsProvider val friendPaths: FileCollection = taskProvider.friendPaths val compileClasspath: Iterable = taskProvider.libraries val destinationDir: File = taskProvider.destinationDirectory.get().asFile - internal val compilerOptions: CompilerJvmOptions = taskProvider.compilerOptions + internal val compilerOptions: KotlinJvmCompilerOptions = taskProvider.compilerOptions } internal inline val T.thisTaskProvider: TaskProvider @@ -532,12 +532,12 @@ internal inline val T.thisTaskProvider: TaskProvider @CacheableTask abstract class KotlinCompile @Inject constructor( - override val compilerOptions: CompilerJvmOptions, + override val compilerOptions: KotlinJvmCompilerOptions, workerExecutor: WorkerExecutor, objectFactory: ObjectFactory ) : AbstractKotlinCompile(objectFactory, workerExecutor), @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl, - KotlinCompilationTask, + KotlinCompilationTask, UsesKotlinJavaToolchain { init { @@ -918,11 +918,11 @@ abstract class KotlinCompile @Inject constructor( @CacheableTask abstract class Kotlin2JsCompile @Inject constructor( - override val compilerOptions: CompilerJsOptions, + override val compilerOptions: KotlinJsCompilerOptions, objectFactory: ObjectFactory, workerExecutor: WorkerExecutor ) : AbstractKotlinCompile(objectFactory, workerExecutor), - KotlinCompilationTask, + KotlinCompilationTask, KotlinJsCompile { init { @@ -1007,12 +1007,12 @@ abstract class Kotlin2JsCompile @Inject constructor( K2JSCompilerArguments() override fun setupCompilerArgs(args: K2JSCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) { - (compilerOptions as CompilerJsOptionsDefault).fillDefaultValues(args) + (compilerOptions as KotlinJsCompilerOptionsDefault).fillDefaultValues(args) super.setupCompilerArgs(args, defaultsOnly = defaultsOnly, ignoreClasspathResolutionErrors = ignoreClasspathResolutionErrors) if (defaultsOnly) return - (compilerOptions as CompilerJsOptionsDefault).fillCompilerArguments(args) + (compilerOptions as KotlinJsCompilerOptionsDefault).fillCompilerArguments(args) if (!args.sourceMapPrefix.isNullOrEmpty()) { args.sourceMapBaseDirs = sourceMapBaseDir.get().asFile.absolutePath } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt index 62417898ccd..b8507abd098 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt @@ -22,9 +22,7 @@ import org.gradle.api.UnknownTaskException import org.gradle.api.tasks.TaskCollection import org.gradle.api.tasks.TaskContainer import org.gradle.api.tasks.TaskProvider -import org.jetbrains.kotlin.gradle.dsl.CompilerJsOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions -import org.jetbrains.kotlin.gradle.dsl.CompilerMultiplatformCommonOptions +import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink import org.jetbrains.kotlin.gradle.tasks.configuration.* @@ -102,7 +100,7 @@ internal open class KotlinTasksProvider { open fun registerKotlinJVMTask( project: Project, taskName: String, - compilerOptions: CompilerJvmOptions, + compilerOptions: KotlinJvmCompilerOptions, configuration: KotlinCompileConfig ): TaskProvider { return project.registerTask(taskName, KotlinCompile::class.java, constructorArgs = listOf(compilerOptions)).also { @@ -113,7 +111,7 @@ internal open class KotlinTasksProvider { fun registerKotlinJSTask( project: Project, taskName: String, - compilerOptions: CompilerJsOptions, + compilerOptions: KotlinJsCompilerOptions, configuration: Kotlin2JsCompileConfig ): TaskProvider { return project.registerTask( @@ -136,7 +134,7 @@ internal open class KotlinTasksProvider { fun registerKotlinCommonTask( project: Project, taskName: String, - compilerOptions: CompilerMultiplatformCommonOptions, + compilerOptions: KotlinMultiplatformCommonCompilerOptions, configuration: KotlinCompileCommonConfig ): TaskProvider { return project.registerTask( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt index 1ed55f00cbf..b16c373f344 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.tasks.configuration import org.gradle.api.Project import org.gradle.api.attributes.Attribute import org.gradle.api.provider.Provider -import org.jetbrains.kotlin.gradle.dsl.CompilerJvmOptions +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension import org.jetbrains.kotlin.gradle.internal.transforms.ClasspathEntrySnapshotTransform import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation @@ -76,7 +76,7 @@ internal open class BaseKotlinCompileConfig : AbstractKotl task.associatedJavaCompileTaskName.value(javaTaskProvider.name) } task.ownModuleName.value( - (compilation.compilerOptions.options as CompilerJvmOptions).moduleName.convention(compilation.ownModuleName) + (compilation.compilerOptions.options as KotlinJvmCompilerOptions).moduleName.convention(compilation.ownModuleName) ) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJsOptionsCompat.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJsOptionsCompat.kt index 71f038ed9d9..025234ecbc2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJsOptionsCompat.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJsOptionsCompat.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile @Suppress("DEPRECATION") class KotlinJsOptionsCompat( private val task: () -> Kotlin2JsCompile, - override val options: CompilerJsOptions + override val options: KotlinJsCompilerOptions ) : KotlinJsOptions { override var freeCompilerArgs: List get() = if (isTaskExecuting) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJvmOptionsCompat.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJvmOptionsCompat.kt index ae05e1ef7a5..506580ae7e5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJvmOptionsCompat.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinJvmOptionsCompat.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @Suppress("DEPRECATION") class KotlinJvmOptionsCompat( private val task: () -> KotlinCompile, - override val options: CompilerJvmOptions + override val options: KotlinJvmCompilerOptions ) : KotlinJvmOptions { override var freeCompilerArgs: List get() = if (isTaskExecuting) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinMultiplatformCommonOptionsCompat.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinMultiplatformCommonOptionsCompat.kt index 82448efd2d3..53ee02c5a3b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinMultiplatformCommonOptionsCompat.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/internal/KotlinMultiplatformCommonOptionsCompat.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon @Suppress("DEPRECATION") class KotlinMultiplatformCommonOptionsCompat( private val task: () -> KotlinCompileCommon, - override val options: CompilerMultiplatformCommonOptions + override val options: KotlinMultiplatformCommonCompilerOptions ) : KotlinMultiplatformCommonOptions { override var freeCompilerArgs: List