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

[Gradle][Minor] Remove unnecessary KotlinConfigurationTools class

Browse Source 
KT-54312
This commit is contained in:
Sebastian Sellmair
2022-09-27 14:28:20 +02:00
committed by Space Team
parent 089e07827f
commit bac1e3208c
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt
+1 -1
View File
@@ -59,7 +59,7 @@ internal open class KotlinAndroidPlugin(
} }
} }
return AndroidProjectHandler(KotlinConfigurationTools(tasksProvider)) return AndroidProjectHandler(tasksProvider)
} }
internal fun Project.dynamicallyApplyWhenAndroidPluginIsApplied( internal fun Project.dynamicallyApplyWhenAndroidPluginIsApplied(
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
-5
View File
@@ -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
)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidProjectHandler.kt
+3 -2
View File
@@ -49,7 +49,7 @@ import java.io.Serializable
import java.util.concurrent.Callable import java.util.concurrent.Callable
internal class AndroidProjectHandler( internal class AndroidProjectHandler(
private val kotlinConfigurationTools: KotlinConfigurationTools private val kotlinTasksProvider: KotlinTasksProvider
) { ) {
private val logger = Logging.getLogger(this.javaClass) private val logger = Logging.getLogger(this.javaClass)
@@ -89,7 +89,7 @@ internal class AndroidProjectHandler(
compilation.compilerOptions.options as KotlinJvmCompilerOptions compilation.compilerOptions.options as KotlinJvmCompilerOptions
) )
preprocessVariant(variant, compilation, project, kotlinConfigurationTools.kotlinTasksProvider) preprocessVariant(variant, compilation, project, kotlinTasksProvider)
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
(kotlinAndroidTarget.compilations as NamedDomainObjectCollection<in KotlinJvmAndroidCompilation>).add(compilation) (kotlinAndroidTarget.compilations as NamedDomainObjectCollection<in KotlinJvmAndroidCompilation>).add(compilation)
@@ -451,3 +451,4 @@ internal inline fun BaseVariant.forEachKotlinSourceDirectorySet(
internal inline fun BaseVariant.forEachJavaSourceDir(action: (ConfigurableFileTree) -> Unit) { internal inline fun BaseVariant.forEachJavaSourceDir(action: (ConfigurableFileTree) -> Unit) {
getSourceFolders(SourceKind.JAVA).forEach(action) getSourceFolders(SourceKind.JAVA).forEach(action)
} }