[Gradle][Minor] Move and rename Project.ifKaptEnabled

KT-54312
This commit is contained in:
Sebastian Sellmair
2022-09-27 14:05:59 +02:00
committed by Space Team
parent 1d397b1c3b
commit d6e95c6b16
3 changed files with 24 additions and 17 deletions
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.gradle.plugin
import com.android.build.gradle.*
import com.android.build.gradle.api.BaseVariant
import org.gradle.api.*
import org.gradle.api.attributes.Category
import org.gradle.api.attributes.Usage
@@ -185,7 +184,7 @@ internal class Kotlin2JvmSourceSetProcessor(
}
override fun doTargetSpecificProcessing() {
ifKaptEnabled(project) {
project.whenKaptEnabled {
Kapt3GradleSubplugin.createAptConfigurationIfNeeded(project, kotlinCompilation.compilationPurpose)
}
@@ -787,19 +786,6 @@ class KotlinConfigurationTools internal constructor(
)
internal fun ifKaptEnabled(project: Project, block: () -> Unit) {
var triggered = false
fun trigger() {
if (triggered) return
triggered = true
block()
}
project.pluginManager.withPlugin("kotlin-kapt") { trigger() }
project.pluginManager.withPlugin("org.jetbrains.kotlin.kapt") { trigger() }
}
private fun SourceSet.clearJavaSrcDirs() {
java.setSrcDirs(emptyList<File>())
}
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator
import com.android.build.gradle.api.AndroidSourceSet
import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.ifKaptEnabled
import org.jetbrains.kotlin.gradle.utils.whenKaptEnabled
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
internal object AndroidKaptSourceSetConfigurator : KotlinAndroidSourceSetConfigurator {
@@ -16,7 +16,7 @@ internal object AndroidKaptSourceSetConfigurator : KotlinAndroidSourceSetConfigu
target: KotlinAndroidTarget,
kotlinSourceSet: KotlinSourceSet,
androidSourceSet: AndroidSourceSet
) = ifKaptEnabled(target.project) {
) = target.project.whenKaptEnabled {
Kapt3GradleSubplugin.createAptConfigurationIfNeeded(target.project, androidSourceSet.name)
}
}
@@ -0,0 +1,21 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.Project
internal fun Project.whenKaptEnabled(block: () -> Unit) {
var triggered = false
fun trigger() {
if (triggered) return
triggered = true
block()
}
pluginManager.withPlugin("kotlin-kapt") { trigger() }
pluginManager.withPlugin("org.jetbrains.kotlin.kapt") { trigger() }
}