diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt index cdb52c51826..be7cfaa495d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt @@ -59,7 +59,7 @@ internal open class KotlinAndroidPlugin( } } - return AndroidProjectHandler(KotlinConfigurationTools(tasksProvider)) + return AndroidProjectHandler(tasksProvider) } internal fun Project.dynamicallyApplyWhenAndroidPluginIsApplied( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 78b479dcdbe..3611b3f0768 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -77,8 +77,3 @@ internal open class KotlinPlugin( } } } - -class KotlinConfigurationTools internal constructor( - @Suppress("EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_WARNING", "EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_ERROR") - val kotlinTasksProvider: KotlinTasksProvider -) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt index eb58221eca6..4a957c55eaa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt @@ -49,7 +49,7 @@ import java.io.Serializable import java.util.concurrent.Callable internal class AndroidProjectHandler( - private val kotlinConfigurationTools: KotlinConfigurationTools + private val kotlinTasksProvider: KotlinTasksProvider ) { private val logger = Logging.getLogger(this.javaClass) @@ -89,7 +89,7 @@ internal class AndroidProjectHandler( compilation.compilerOptions.options as KotlinJvmCompilerOptions ) - preprocessVariant(variant, compilation, project, kotlinConfigurationTools.kotlinTasksProvider) + preprocessVariant(variant, compilation, project, kotlinTasksProvider) @Suppress("UNCHECKED_CAST") (kotlinAndroidTarget.compilations as NamedDomainObjectCollection).add(compilation) @@ -451,3 +451,4 @@ internal inline fun BaseVariant.forEachKotlinSourceDirectorySet( internal inline fun BaseVariant.forEachJavaSourceDir(action: (ConfigurableFileTree) -> Unit) { getSourceFolders(SourceKind.JAVA).forEach(action) } +