Align new compiler options names with api naming
Use Kotlin*CompilerOptions or Kotlin*CompilerToolOptions naming approach. ^KT-54306 Fixed
This commit is contained in:
Yahor Berdnikau
committed by
Space Team
Space Team
parent
31b3d8f859
commit
023b9bf284
+2
-2
@@ -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<String, String>
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ interface KotlinNativeArtifactConfig : KotlinArtifactConfig {
|
||||
replaceWith = ReplaceWith("toolOptions(fn)")
|
||||
)
|
||||
fun kotlinOptions(fn: Action<KotlinCommonToolOptions>)
|
||||
fun toolOptions(configure: Action<CompilerCommonToolOptions>)
|
||||
fun toolOptions(configure: Action<KotlinCommonCompilerToolOptions>)
|
||||
fun binaryOption(name: String, value: String)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
interface CompilerCommonToolOptions {
|
||||
interface KotlinCommonCompilerToolOptions {
|
||||
|
||||
/**
|
||||
* Report an error if there are any warnings
|
||||
+2
-2
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
}
|
||||
+2
-2
@@ -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
|
||||
}
|
||||
|
||||
+2
-2
@@ -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<out CO : CompilerCommonOptions> {
|
||||
interface HasCompilerOptions<out CO : KotlinCommonCompilerOptions> {
|
||||
val options: CO
|
||||
|
||||
fun configure(configuration: CO.() -> Unit) {
|
||||
|
||||
+2
-2
@@ -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<out KotlinJvmCompile>
|
||||
|
||||
-1
@@ -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
|
||||
|
||||
+2
-2
@@ -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<out CO : CompilerCommonOptions> : Task {
|
||||
interface KotlinCompilationTask<out CO : KotlinCommonCompilerOptions> : Task {
|
||||
@get:Nested
|
||||
val compilerOptions: CO
|
||||
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@ interface BaseKotlinCompile : KotlinCompileTool {
|
||||
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
|
||||
interface KotlinJvmCompile : BaseKotlinCompile,
|
||||
KotlinCompileDeprecated<KotlinJvmOptionsDeprecated>,
|
||||
KotlinCompilationTask<CompilerJvmOptions> {
|
||||
KotlinCompilationTask<KotlinJvmCompilerOptions> {
|
||||
|
||||
// JVM specific
|
||||
@get:Internal("Takes part in compiler args.")
|
||||
|
||||
+2
-2
@@ -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<out TO : CompilerCommonToolOptions> : Task {
|
||||
interface KotlinToolTask<out TO : KotlinCommonCompilerToolOptions> : Task {
|
||||
@get:Nested
|
||||
val toolOptions: TO
|
||||
|
||||
|
||||
Reference in New Issue
Block a user