azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Move UsesKotlinJavaToolchain inheritance into api

Browse Source 
Such way it will be visible which tasks are using this feature.

^KT-58858 In Progress
This commit is contained in:
Yahor Berdnikau
2023-06-30 16:36:39 +02:00
committed by Space Team
parent 8988557b6d
commit 7b665e7673
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+12 -2
View File
@@ -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 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 getClassesDir ()Lorg/gradle/api/file/DirectoryProperty;
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 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 fun getFriendPaths ()Lorg/gradle/api/file/ConfigurableFileCollection;
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 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 fun getKaptClasspath ()Lorg/gradle/api/file/ConfigurableFileCollection;
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 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 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;Lkotlin/jvm/functions/Function1;)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 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 getModuleName ()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 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 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;Lkotlin/jvm/functions/Function1;)V
public static fun kotlinOptions (Lorg/jetbrains/kotlin/gradle/tasks/KotlinJvmCompile;Lorg/gradle/api/Action;)V
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTaskConfigs.kt
+4 -2
View File
@@ -80,7 +80,8 @@ interface BaseKotlinCompile : KotlinCompileTool {
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
interface KotlinJvmCompile : BaseKotlinCompile,
KotlinCompileDeprecated<KotlinJvmOptionsDeprecated>,
KotlinCompilationTask<KotlinJvmCompilerOptions> {
KotlinCompilationTask<KotlinJvmCompilerOptions>,
UsesKotlinJavaToolchain {
@get:Deprecated(
message = "Please migrate to compilerOptions.moduleName",
@@ -137,7 +138,8 @@ interface KaptGenerateStubs : KotlinJvmCompile {
override val moduleName: Property<String>
}
interface BaseKapt : Task {
interface BaseKapt : Task,
UsesKotlinJavaToolchain {
//part of kaptClasspath consisting from external artifacts only
//basically kaptClasspath = kaptExternalClasspath + artifacts built locally
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
-1
View File
@@ -34,7 +34,6 @@ abstract class KaptTask @Inject constructor(
objectFactory: ObjectFactory
) : DefaultTask(),
TaskWithLocalState,
UsesKotlinJavaToolchain,
BaseKapt {
init {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt
+1 -2
View File
@@ -62,8 +62,7 @@ abstract class KotlinCompile @Inject constructor(
) : AbstractKotlinCompile<K2JVMCompilerArguments>(objectFactory, workerExecutor),
K2MultiplatformCompilationTask,
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") KotlinJvmCompileDsl,
KotlinCompilationTask<KotlinJvmCompilerOptions>,
UsesKotlinJavaToolchain {
KotlinCompilationTask<KotlinJvmCompilerOptions> {
final override val kotlinOptions: KotlinJvmOptions = KotlinJvmOptionsCompat(
{ this },