From 4e556af54dbfe525ddc5c89c54875decc0f85b8a Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 21 Jun 2021 17:32:27 +0200
Subject: [PATCH] Rename KotlinJavaToolchainProvider to
 DefaultKotlinJavaToolchain.

'Provider' suffix doesn't make sense.

^KT-45611 In Progress
^KT-43095 In Progress
---
 .../org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt       | 2 +-
 ...inJavaToolchainProvider.kt => DefaultKotlinJavaToolchain.kt} | 2 +-
 .../src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/{KotlinJavaToolchainProvider.kt => DefaultKotlinJavaToolchain.kt} (99%)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
index da1f89a5f61..d36f5f0e572 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
@@ -126,7 +126,7 @@ abstract class KaptTask @Inject constructor(
     abstract val classpath: ConfigurableFileCollection
 
     @get:Internal
-    internal val defaultKotlinJavaToolchain: Provider<KotlinJavaToolchainProvider> = objectFactory
+    internal val defaultKotlinJavaToolchain: Provider<DefaultKotlinJavaToolchain> = objectFactory
         .propertyWithNewInstance(
             project.gradle,
             { null }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchainProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/DefaultKotlinJavaToolchain.kt
similarity index 99%
rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchainProvider.kt
rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/DefaultKotlinJavaToolchain.kt
index dfcfcec3a73..47d696390f5 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJavaToolchainProvider.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/DefaultKotlinJavaToolchain.kt
@@ -27,7 +27,7 @@ import java.io.File
 import javax.inject.Inject
 import kotlin.reflect.full.functions
 
-internal abstract class KotlinJavaToolchainProvider @Inject constructor(
+internal abstract class DefaultKotlinJavaToolchain @Inject constructor(
     private val objects: ObjectFactory,
     projectLayout: ProjectLayout,
     gradle: Gradle,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index c5f00cd7f6d..c779fdf4a79 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -461,7 +461,7 @@ abstract class KotlinCompile @Inject constructor(
     abstract val useClasspathSnapshot: Property<Boolean>
 
     @get:Internal
-    internal val defaultKotlinJavaToolchain: Provider<KotlinJavaToolchainProvider> = objects
+    internal val defaultKotlinJavaToolchain: Provider<DefaultKotlinJavaToolchain> = objects
         .propertyWithNewInstance(
             project.gradle,
             { this }