Skip to content

Commit a6f14fc

Browse files
AYastrebovSpace Team
AYastrebov
authored and
Space Team
committed
KT-73419 Refactor and extend ToolingDiagnostic
1 parent 6afc0a8 commit a6f14fc

File tree

8 files changed

+1445
-672
lines changed

8 files changed

+1445
-672
lines changed

‎libraries/tools/kotlin-gradle-plugin-annotations/api/kotlin-gradle-plugin-annotations.api

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ public abstract interface annotation class org/jetbrains/kotlin/gradle/Deprecate
77
public final class org/jetbrains/kotlin/gradle/DeprecatedTargetPresetApiKt {
88
public static final field PRESETS_API_IS_DEPRECATED_MESSAGE Ljava/lang/String;
99
public static final field PRESETS_DEPRECATION_MESSAGE_SUFFIX Ljava/lang/String;
10+
public static final field PRESETS_DEPRECATION_SOLUTION Ljava/lang/String;
11+
public static final field PRESETS_DEPRECATION_URL Ljava/lang/String;
12+
public static final field PRESETS_DEPRECATION_URL_PREFIX Ljava/lang/String;
1013
}
1114

1215
public abstract interface annotation class org/jetbrains/kotlin/gradle/ExperimentalKotlinGradlePluginApi : java/lang/annotation/Annotation {

‎libraries/tools/kotlin-gradle-plugin-annotations/src/main/kotlin/org/jetbrains/kotlin/gradle/DeprecatedTargetPresetApi.kt

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55

66
package org.jetbrains.kotlin.gradle
77

8-
const val PRESETS_DEPRECATION_MESSAGE_SUFFIX =
9-
"API is deprecated and will be removed in 2.2.0 releases. Learn how to configure targets at: https://kotl.in/target-configuration"
8+
const val PRESETS_DEPRECATION_MESSAGE_SUFFIX = "API is deprecated and will be removed in 2.2.0 releases."
9+
const val PRESETS_DEPRECATION_SOLUTION = "Migrate to built-in target DSL - for example, use 'jvm()' instead of 'fromPreset(Jvm)'"
10+
const val PRESETS_DEPRECATION_URL_PREFIX = "Learn how to configure targets at:"
11+
const val PRESETS_DEPRECATION_URL = "https://kotl.in/target-configuration"
12+
1013
const val PRESETS_API_IS_DEPRECATED_MESSAGE = "The presets $PRESETS_DEPRECATION_MESSAGE_SUFFIX"
1114

1215
@RequiresOptIn(

‎libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api

+38-6
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingD
11291129
}
11301130

11311131
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$CreateTarget : org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticFactory {
1132-
public static final field DEPRECATION_MESSAGE Ljava/lang/String;
11331132
public static final field INSTANCE Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$CreateTarget;
11341133
public final fun invoke ()Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic;
11351134
}
@@ -1277,11 +1276,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingD
12771276
public final fun invoke (Ljava/io/File;Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic;
12781277
}
12791278

1280-
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$Kotlin12XMppDeprecation : org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticFactory {
1281-
public static final field INSTANCE Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$Kotlin12XMppDeprecation;
1282-
public final fun invoke ()Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic;
1283-
}
1284-
12851279
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$KotlinCompilationSourceDeprecation : org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticFactory {
12861280
public static final field INSTANCE Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics$KotlinCompilationSourceDeprecation;
12871281
public final fun invoke (Ljava/lang/Throwable;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic;
@@ -1500,6 +1494,32 @@ public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingD
15001494
public final fun invoke (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic;
15011495
}
15021496

1497+
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Documentation {
1498+
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
1499+
public final fun component1 ()Ljava/lang/String;
1500+
public final fun component2 ()Ljava/lang/String;
1501+
public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Documentation;
1502+
public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Documentation;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Documentation;
1503+
public fun equals (Ljava/lang/Object;)Z
1504+
public final fun getAdditionalUrlContext ()Ljava/lang/String;
1505+
public final fun getUrl ()Ljava/lang/String;
1506+
public fun hashCode ()I
1507+
public fun toString ()Ljava/lang/String;
1508+
}
1509+
1510+
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$ID {
1511+
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
1512+
public final fun component1 ()Ljava/lang/String;
1513+
public final fun component2 ()Ljava/lang/String;
1514+
public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$ID;
1515+
public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$ID;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$ID;
1516+
public fun equals (Ljava/lang/Object;)Z
1517+
public final fun getDisplayName ()Ljava/lang/String;
1518+
public final fun getId ()Ljava/lang/String;
1519+
public fun hashCode ()I
1520+
public fun toString ()Ljava/lang/String;
1521+
}
1522+
15031523
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Severity : java/lang/Enum {
15041524
public static final field ERROR Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Severity;
15051525
public static final field FATAL Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Severity;
@@ -1508,6 +1528,18 @@ public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnos
15081528
public static fun values ()[Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnostic$Severity;
15091529
}
15101530

1531+
public abstract interface class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticBuilder {
1532+
public abstract fun documentation (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
1533+
public abstract fun message (Lkotlin/jvm/functions/Function0;)V
1534+
public abstract fun name (Lkotlin/jvm/functions/Function0;)V
1535+
public abstract fun solution (Lkotlin/jvm/functions/Function0;)V
1536+
public abstract fun solutions (Lkotlin/jvm/functions/Function0;)V
1537+
}
1538+
1539+
public final class org/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticBuilder$DefaultImpls {
1540+
public static synthetic fun documentation$default (Lorg/jetbrains/kotlin/gradle/plugin/diagnostics/ToolingDiagnosticBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
1541+
}
1542+
15111543
public abstract interface class org/jetbrains/kotlin/gradle/plugin/ide/IdeCompilerArgumentsResolver {
15121544
public static final field Companion Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeCompilerArgumentsResolver$Companion;
15131545
public static fun instance (Lorg/gradle/api/Project;)Lorg/jetbrains/kotlin/gradle/plugin/ide/IdeCompilerArgumentsResolver;

0 commit comments

Comments
 (0)