[Gradle] Move UsesKotlinJavaToolchain inheritance into api
Such way it will be visible which tasks are using this feature. ^KT-58858 In Progress
This commit is contained in:
committed by
Space Team
parent
8988557b6d
commit
7b665e7673
@@ -1268,7 +1268,7 @@ public class org/jetbrains/kotlin/gradle/plugin/mpp/NativeOutputKind : java/lang
|
|||||||
public static fun values ()[Lorg/jetbrains/kotlin/gradle/plugin/mpp/NativeOutputKind;
|
public static fun values ()[Lorg/jetbrains/kotlin/gradle/plugin/mpp/NativeOutputKind;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKapt : org/gradle/api/Task {
|
public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKapt : org/gradle/api/Task, org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain {
|
||||||
public abstract fun getAnnotationProcessorOptionProviders ()Ljava/util/List;
|
public abstract fun getAnnotationProcessorOptionProviders ()Ljava/util/List;
|
||||||
public abstract fun getClassesDir ()Lorg/gradle/api/file/DirectoryProperty;
|
public abstract fun getClassesDir ()Lorg/gradle/api/file/DirectoryProperty;
|
||||||
public abstract fun getClasspath ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
public abstract fun getClasspath ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
||||||
@@ -1286,6 +1286,10 @@ public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKapt : org
|
|||||||
public abstract fun getStubsDir ()Lorg/gradle/api/file/DirectoryProperty;
|
public abstract fun getStubsDir ()Lorg/gradle/api/file/DirectoryProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public final class org/jetbrains/kotlin/gradle/tasks/BaseKapt$DefaultImpls {
|
||||||
|
public static fun getKotlinJavaToolchain (Lorg/jetbrains/kotlin/gradle/tasks/BaseKapt;)Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain;
|
||||||
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKotlinCompile : org/jetbrains/kotlin/gradle/tasks/KotlinCompileTool {
|
public abstract interface class org/jetbrains/kotlin/gradle/tasks/BaseKotlinCompile : org/jetbrains/kotlin/gradle/tasks/KotlinCompileTool {
|
||||||
public abstract fun getFriendPaths ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
public abstract fun getFriendPaths ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
||||||
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
||||||
@@ -1317,6 +1321,10 @@ public abstract interface class org/jetbrains/kotlin/gradle/tasks/Kapt : org/jet
|
|||||||
public abstract fun getKaptJars ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
public abstract fun getKaptJars ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public final class org/jetbrains/kotlin/gradle/tasks/Kapt$DefaultImpls {
|
||||||
|
public static fun getKotlinJavaToolchain (Lorg/jetbrains/kotlin/gradle/tasks/Kapt;)Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain;
|
||||||
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs : org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile {
|
public abstract interface class org/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs : org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile {
|
||||||
public abstract fun getKaptClasspath ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
public abstract fun getKaptClasspath ()Lorg/gradle/api/file/ConfigurableFileCollection;
|
||||||
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
||||||
@@ -1326,6 +1334,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/tasks/KaptGenerateSt
|
|||||||
public final class org/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs$DefaultImpls {
|
public final class org/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs$DefaultImpls {
|
||||||
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lkotlin/jvm/functions/Function1;)V
|
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lkotlin/jvm/functions/Function1;)V
|
||||||
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lorg/gradle/api/Action;)V
|
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lorg/gradle/api/Action;)V
|
||||||
|
public static fun getKotlinJavaToolchain (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;)Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain;
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lgroovy/lang/Closure;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lgroovy/lang/Closure;)V
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lkotlin/jvm/functions/Function1;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lkotlin/jvm/functions/Function1;)V
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lorg/gradle/api/Action;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KaptGenerateStubs;Lorg/gradle/api/Action;)V
|
||||||
@@ -1385,7 +1394,7 @@ public final class org/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain$JdkSett
|
|||||||
public static fun use (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain$JdkSetter;Ljava/lang/String;Ljava/lang/Object;)V
|
public static fun use (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain$JdkSetter;Ljava/lang/String;Ljava/lang/Object;)V
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract interface class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile : org/jetbrains/kotlin/gradle/dsl/KotlinCompile, org/jetbrains/kotlin/gradle/tasks/BaseKotlinCompile, org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask {
|
public abstract interface class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile : org/jetbrains/kotlin/gradle/dsl/KotlinCompile, org/jetbrains/kotlin/gradle/tasks/BaseKotlinCompile, org/jetbrains/kotlin/gradle/tasks/KotlinCompilationTask, org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain {
|
||||||
public abstract fun getJvmTargetValidationMode ()Lorg/gradle/api/provider/Property;
|
public abstract fun getJvmTargetValidationMode ()Lorg/gradle/api/provider/Property;
|
||||||
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
public abstract fun getModuleName ()Lorg/gradle/api/provider/Property;
|
||||||
public abstract fun getParentKotlinOptions ()Lorg/gradle/api/provider/Property;
|
public abstract fun getParentKotlinOptions ()Lorg/gradle/api/provider/Property;
|
||||||
@@ -1394,6 +1403,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompi
|
|||||||
public final class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile$DefaultImpls {
|
public final class org/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile$DefaultImpls {
|
||||||
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lkotlin/jvm/functions/Function1;)V
|
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lkotlin/jvm/functions/Function1;)V
|
||||||
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lorg/gradle/api/Action;)V
|
public static fun compilerOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lorg/gradle/api/Action;)V
|
||||||
|
public static fun getKotlinJavaToolchain (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;)Lorg/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchain;
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lgroovy/lang/Closure;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lgroovy/lang/Closure;)V
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lkotlin/jvm/functions/Function1;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lkotlin/jvm/functions/Function1;)V
|
||||||
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lorg/gradle/api/Action;)V
|
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lorg/gradle/api/Action;)V
|
||||||
|
|||||||
+4
-2
@@ -80,7 +80,8 @@ interface BaseKotlinCompile : KotlinCompileTool {
|
|||||||
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
|
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
|
||||||
interface KotlinJvmCompile : BaseKotlinCompile,
|
interface KotlinJvmCompile : BaseKotlinCompile,
|
||||||
KotlinCompileDeprecated<KotlinJvmOptionsDeprecated>,
|
KotlinCompileDeprecated<KotlinJvmOptionsDeprecated>,
|
||||||
KotlinCompilationTask<KotlinJvmCompilerOptions> {
|
KotlinCompilationTask<KotlinJvmCompilerOptions>,
|
||||||
|
UsesKotlinJavaToolchain {
|
||||||
|
|
||||||
@get:Deprecated(
|
@get:Deprecated(
|
||||||
message = "Please migrate to compilerOptions.moduleName",
|
message = "Please migrate to compilerOptions.moduleName",
|
||||||
@@ -137,7 +138,8 @@ interface KaptGenerateStubs : KotlinJvmCompile {
|
|||||||
override val moduleName: Property<String>
|
override val moduleName: Property<String>
|
||||||
}
|
}
|
||||||
|
|
||||||
interface BaseKapt : Task {
|
interface BaseKapt : Task,
|
||||||
|
UsesKotlinJavaToolchain {
|
||||||
|
|
||||||
//part of kaptClasspath consisting from external artifacts only
|
//part of kaptClasspath consisting from external artifacts only
|
||||||
//basically kaptClasspath = kaptExternalClasspath + artifacts built locally
|
//basically kaptClasspath = kaptExternalClasspath + artifacts built locally
|
||||||
|
|||||||
-1
@@ -34,7 +34,6 @@ abstract class KaptTask @Inject constructor(
|
|||||||
objectFactory: ObjectFactory
|
objectFactory: ObjectFactory
|
||||||
) : DefaultTask(),
|
) : DefaultTask(),
|
||||||
TaskWithLocalState,
|
TaskWithLocalState,
|
||||||
UsesKotlinJavaToolchain,
|
|
||||||
BaseKapt {
|
BaseKapt {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
|||||||
+1
-2
@@ -62,8 +62,7 @@ abstract class KotlinCompile @Inject constructor(
|
|||||||
) : AbstractKotlinCompile<K2JVMCompilerArguments>(objectFactory, workerExecutor),
|
) : AbstractKotlinCompile<K2JVMCompilerArguments>(objectFactory, workerExecutor),
|
||||||
K2MultiplatformCompilationTask,
|
K2MultiplatformCompilationTask,
|
||||||
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl,
|
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl,
|
||||||
KotlinCompilationTask<KotlinJvmCompilerOptions>,
|
KotlinCompilationTask<KotlinJvmCompilerOptions> {
|
||||||
UsesKotlinJavaToolchain {
|
|
||||||
|
|
||||||
final override val kotlinOptions: KotlinJvmOptions = KotlinJvmOptionsCompat(
|
final override val kotlinOptions: KotlinJvmOptions = KotlinJvmOptionsCompat(
|
||||||
{ this },
|
{ this },
|
||||||
|
|||||||
Reference in New Issue
Block a user