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

Drop Gradle versions older than 4.9

Browse Source 
* Replace `TaskHolder` with `TaskProvider`, remove `TaskHolder`
* Migrate Gradle integration tests to Gradle 4.9+
This commit is contained in:
Sergey Igushkin
2019-08-06 20:49:45 +03:00
parent 9f0c5675bd
commit 43c3122a13
51 changed files with 219 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+2 -5
View File
@@ -21,7 +21,7 @@ open class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT() {
get() = AGPVersion.v3_2_0
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.6")
get() = GradleVersionRequired.None
@Test
fun testAndroidWithNewMppApp() = with(Project("new-mpp-android", GradleVersionRequired.AtLeast("5.0"))) {
@@ -399,10 +399,7 @@ class KotlinAndroid30GradleIT : KotlinAndroid3GradleIT() {
get() = GradleVersionRequired.Until("4.10.2")
@Test
fun testOmittedStdlibVersion() = Project(
"AndroidProject",
defaultGradleVersion.maxVersion?.let { GradleVersionRequired.InRange("4.4", it) } ?: GradleVersionRequired.AtLeast("4.4")
).run {
fun testOmittedStdlibVersion() = Project("AndroidProject").run {
setupWorkingDir()
gradleBuildScript("Lib").modify {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class BuildCacheIT : BaseGradleIT() {
super.defaultBuildOptions().copy(withBuildCache = true)
companion object {
private val GRADLE_VERSION = GradleVersionRequired.AtLeast("4.3")
private val GRADLE_VERSION = GradleVersionRequired.None
}
@Test
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class BuildCacheRelocationIT : BaseGradleIT() {
val (firstProject, secondProject) = (0..1).map { id ->
workingDir = workingDirs[id]
Project(projectName, GradleVersionRequired.AtLeast("4.4"), projectDirectoryPrefix).apply {
Project(projectName, directoryPrefix = projectDirectoryPrefix).apply {
setupWorkingDir()
initProject()
prepareLocalBuildCache(localBuildCacheDirectory)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CocoaPodsIT.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import kotlin.test.fail
class CocoaPodsIT : BaseGradleIT() {
// We use Kotlin DSL. Earlier Gradle versions fail at accessors codegen.
val gradleVersion = GradleVersionRequired.AtLeast("4.9")
val gradleVersion = GradleVersionRequired.None
val PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER = "<import_mode_directive>"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.junit.Assume
sealed class GradleVersionRequired(val minVersion: String, val maxVersion: String?) {
companion object {
const val OLDEST_SUPPORTED = "4.3"
const val OLDEST_SUPPORTED = "4.9"
}
class Exact(version: String) : GradleVersionRequired(version, version)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JavaUpToDateIT.kt
+3 -3
View File
@@ -11,7 +11,7 @@ import org.junit.Test
class JavaUpToDateIT : BaseGradleIT() {
@Test
fun testKotlinMethodBodyIsChanged() {
val project = Project("javaUpToDate", GradleVersionRequired.AtLeast("4.3"))
val project = Project("javaUpToDate")
project.build("build") {
assertSuccessful()
@@ -33,7 +33,7 @@ class JavaUpToDateIT : BaseGradleIT() {
@Test
fun testKotlinNewLineAdded() {
val project = Project("javaUpToDate", GradleVersionRequired.AtLeast("4.3"))
val project = Project("javaUpToDate")
project.build("build") {
assertSuccessful()
@@ -50,7 +50,7 @@ class JavaUpToDateIT : BaseGradleIT() {
@Test
fun testPrivateMethodSignatureChanged() {
val project = Project("javaUpToDate", GradleVersionRequired.AtLeast("4.3"))
val project = Project("javaUpToDate")
project.build("build") {
assertSuccessful()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
+2 -2
View File
@@ -16,7 +16,7 @@ open class Kapt3Android32IT : Kapt3AndroidIT() {
get() = AGPVersion.v3_2_0
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.6")
get() = GradleVersionRequired.None
}
open class Kapt3Android33IT : Kapt3AndroidIT() {
@@ -81,7 +81,7 @@ class Kapt3Android31IT : Kapt3AndroidIT() {
// there is a weird validation exception in testICWithAnonymousClasses with 5.0 todo: fix it
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.InRange("4.4", "4.10.2")
get() = GradleVersionRequired.Until("4.10.2")
}
open class Kapt3AndroidIT : Kapt3BaseIT() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+2 -8
View File
@@ -46,12 +46,8 @@ class Kapt3WorkersIT : Kapt3IT() {
@Test
fun testJavacIsLoadedOnce() {
// todo: actual minimum version is 4.3, but I had some problems. Investigate later.
// todo: consider minimum version for the whole class, with Gradle <4.3 all tests duplicate tests without workers
val gradleVersionRequired = GradleVersionRequired.AtLeast("4.5.1")
val project =
Project("javacIsLoadedOnce", directoryPrefix = "kapt2", gradleVersionRequirement = gradleVersionRequired)
Project("javacIsLoadedOnce", directoryPrefix = "kapt2")
project.build("build") {
assertSuccessful()
assertSubstringCount("Loaded com.sun.tools.javac.util.Context from", 1)
@@ -60,10 +56,8 @@ class Kapt3WorkersIT : Kapt3IT() {
@Test
fun testKaptSkipped() {
val gradleVersionRequired = GradleVersionRequired.AtLeast("4.3")
val project =
Project("kaptSkipped", directoryPrefix = "kapt2", gradleVersionRequirement = gradleVersionRequired)
Project("kaptSkipped", directoryPrefix = "kapt2")
project.build("build") {
assertSuccessful()
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+1 -7
View File
@@ -36,13 +36,7 @@ open class KaptIncrementalIT : BaseGradleIT() {
assertSuccessful()
assertTasksExecuted(":kaptGenerateStubsKotlin", ":compileKotlin")
assertTasksUpToDate(":kaptKotlin")
// compileJava is up-to-date with Gradle >= 4.3, executed otherwise
if (project.testGradleVersionAtLeast("4.3")) {
assertTasksUpToDate(":compileJava")
} else {
assertTasksExecuted(":compileJava")
}
assertTasksUpToDate(":compileJava")
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+7 -8
View File
@@ -366,7 +366,7 @@ class KotlinGradleIT : BaseGradleIT() {
@Test
fun testOmittedStdlibVersion() {
val project = Project("kotlinProject", GradleVersionRequired.AtLeast("4.4"))
val project = Project("kotlinProject")
project.setupWorkingDir()
File(project.projectDir, "build.gradle").modify {
it.replace("kotlin-stdlib:\$kotlin_version", "kotlin-stdlib").apply { check(!equals(it)) } + "\n" + """
@@ -739,7 +739,7 @@ class KotlinGradleIT : BaseGradleIT() {
@Test
fun testDefaultKotlinVersionIsNotAffectedByTransitiveDependencies() =
with(Project("simpleProject", GradleVersionRequired.AtLeast("4.4"))) {
with(Project("simpleProject")) {
setupWorkingDir()
// Add a dependency with an explicit lower Kotlin version that has a kotlin-stdlib transitive dependency:
gradleBuildScript().appendText("\ndependencies { compile 'org.jetbrains.kotlin:kotlin-reflect:1.2.71' }")
@@ -753,7 +753,7 @@ class KotlinGradleIT : BaseGradleIT() {
@Test
fun testKotlinJvmProjectPublishesKotlinApiDependenciesAsCompile() =
with(Project("simpleProject", GradleVersionRequired.AtLeast("4.4"))) {
with(Project("simpleProject")) {
setupWorkingDir()
gradleBuildScript().appendText(
"\n" + """
@@ -786,11 +786,10 @@ class KotlinGradleIT : BaseGradleIT() {
@Test
fun testNoTaskConfigurationForcing() {
val gradleVersionRequirement = GradleVersionRequired.AtLeast("4.9")
val projects = listOf(
Project("simpleProject", gradleVersionRequirement),
Project("kotlin2JsNoOutputFileProject", gradleVersionRequirement),
Project("sample-app", gradleVersionRequirement, "new-mpp-lib-and-app")
Project("simpleProject"),
Project("kotlin2JsNoOutputFileProject"),
Project("sample-app", directoryPrefix = "new-mpp-lib-and-app")
)
projects.forEach {
@@ -925,7 +924,7 @@ class KotlinGradleIT : BaseGradleIT() {
@Test
fun testUserDefinedAttributesInSinglePlatformProject() =
with(Project("multiprojectWithDependency", GradleVersionRequired.AtLeast("4.7"))) {
with(Project("multiprojectWithDependency")) {
setupWorkingDir()
gradleBuildScript("projA").appendText(
"\n" + """
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+7 -9
View File
@@ -52,7 +52,7 @@ fun configure(): NativeTargets {
}
class NewMultiplatformIT : BaseGradleIT() {
val gradleVersion = GradleVersionRequired.AtLeast("4.7")
val gradleVersion = GradleVersionRequired.None
val nativeHostTargetName = configure().current
val supportedNativeTargets = configure().supported
@@ -70,17 +70,15 @@ class NewMultiplatformIT : BaseGradleIT() {
@Test
fun testLibAndAppWithGradleKotlinDsl() = doTestLibAndApp(
"sample-lib-gradle-kotlin-dsl",
"sample-app-gradle-kotlin-dsl",
GradleVersionRequired.AtLeast("4.9") // earlier Gradle versions fail at accessors codegen
"sample-app-gradle-kotlin-dsl"
)
private fun doTestLibAndApp(
libProjectName: String, appProjectName: String,
gradleVersionRequired: GradleVersionRequired = gradleVersion
libProjectName: String, appProjectName: String
) {
val libProject = transformProjectWithPluginsDsl(libProjectName, gradleVersionRequired, "new-mpp-lib-and-app")
val appProject = transformProjectWithPluginsDsl(appProjectName, gradleVersionRequired, "new-mpp-lib-and-app")
val oldStyleAppProject = Project("sample-old-style-app", gradleVersionRequired, "new-mpp-lib-and-app")
val libProject = transformProjectWithPluginsDsl(libProjectName, directoryPrefix = "new-mpp-lib-and-app")
val appProject = transformProjectWithPluginsDsl(appProjectName, directoryPrefix = "new-mpp-lib-and-app")
val oldStyleAppProject = Project("sample-old-style-app", directoryPrefix = "new-mpp-lib-and-app")
val compileTasksNames =
listOf("Jvm6", "NodeJs", "Metadata", "Wasm32", nativeHostTargetName.capitalize()).map { ":compileKotlin$it" }
@@ -2017,7 +2015,7 @@ class NewMultiplatformIT : BaseGradleIT() {
}
@Test
fun testSuggestionToEnableMetadata() = with(Project("sample-lib", GradleVersionRequired.AtLeast("4.7"), "new-mpp-lib-and-app")) {
fun testSuggestionToEnableMetadata() = with(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) {
build {
assertNotContains(GRADLE_NO_METADATA_WARNING)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt
+2 -2
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.util.testResolveAllConfigurations
import org.junit.Test
class VariantAwareDependenciesIT : BaseGradleIT() {
private val gradleVersion = GradleVersionRequired.AtLeast("4.8")
private val gradleVersion = GradleVersionRequired.None
@Test
fun testJvmKtAppResolvesMppLib() {
@@ -245,7 +245,7 @@ class VariantAwareDependenciesIT : BaseGradleIT() {
@Test
fun testJvmWithJavaProjectCanBeResolvedInAllConfigurations() =
with(Project("new-mpp-jvm-with-java-multi-module", GradleVersionRequired.AtLeast("4.7"))) {
with(Project("new-mpp-jvm-with-java-multi-module")) {
testResolveAllConfigurations("app")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/WorkersIT.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class WorkersIT : BaseGradleIT() {
}
private fun parallelTasksImpl(isParallel: Boolean) =
with(Project("new-mpp-parallel", GradleVersionRequired.AtLeast("4.7"))) {
with(Project("new-mpp-parallel")) {
val options = defaultBuildOptions().copy(parallelTasksInProject = isParallel, withDaemon = false)
val traceLoading = "-Dorg.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.trace.loading=true"
build("assemble", traceLoading, options = options) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import kotlin.test.assertTrue
class KotlinAndroidExtensionIT : BaseGradleIT() {
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.4")
get() = GradleVersionRequired.None
override fun defaultBuildOptions(): BuildOptions {
return super.defaultBuildOptions().copy(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import kotlin.test.assertTrue
class KotlinProjectIT : BaseGradleIT() {
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.4")
get() = GradleVersionRequired.None
override fun defaultBuildOptions(): BuildOptions {
return super.defaultBuildOptions().copy(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformExtension.kt
+1 -5
View File
@@ -47,11 +47,7 @@ open class KotlinMultiplatformExtension : KotlinProjectExtension(), KotlinTarget
fun targetFromPreset(preset: KotlinTargetPreset<*>, configure: Closure<*>) = targetFromPreset(preset, preset.name, configure)
internal val rootSoftwareComponent: KotlinSoftwareComponent by lazy {
if (isGradleVersionAtLeast(4, 7)) {
KotlinSoftwareComponentWithCoordinatesAndPublication("kotlin", targets)
} else {
KotlinSoftwareComponent("kotlin", targets)
}
KotlinSoftwareComponentWithCoordinatesAndPublication("kotlin", targets)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt
+10 -20
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTaskData
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.isWorkerAPISupported
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
import java.io.ByteArrayOutputStream
import java.io.File
@@ -121,7 +120,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
}
fun Project.isUseWorkerApi(): Boolean {
return isWorkerAPISupported() && hasProperty(USE_WORKER_API) && property(USE_WORKER_API) == "true"
return hasProperty(USE_WORKER_API) && property(USE_WORKER_API) == "true"
}
fun Project.isIncrementalKapt(): Boolean {
@@ -302,12 +301,9 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
val androidOptions = kaptVariantData?.annotationProcessorOptions ?: emptyMap()
val apOptionsFromProviders =
if (isGradleVersionAtLeast(4, 6))
kaptVariantData?.annotationProcessorOptionProviders
?.flatMap { (it as CommandLineArgumentProvider).asArguments() }
.orEmpty()
else
emptyList()
kaptVariantData?.annotationProcessorOptionProviders
?.flatMap { (it as CommandLineArgumentProvider).asArguments() }
.orEmpty()
val subluginOptionsFromProvidedApOptions = apOptionsFromProviders.map {
// Use the internal subplugin option type to exclude them from Gradle input/output checks, as their providers are already
@@ -394,11 +390,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
kaptTask.isIncremental = project.isIncrementalKapt()
if (kaptTask.isIncremental) {
kaptTask.incAptCache = getKaptIncrementalAnnotationProcessingCache()
if (isGradleVersionAtLeast(4, 3)) {
kaptTask.localState.register(kaptTask.incAptCache)
} else {
kaptTask.outputs.files(kaptTask.incAptCache).withPropertyName("incrementalAptCache")
}
kaptTask.localState.register(kaptTask.incAptCache)
maybeRegisterTransform(project)
val classStructure = project.configurations.create("_classStructure${taskName}")
@@ -522,13 +514,11 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
@Suppress("UNCHECKED_CAST")
options.compilerArgs = newCompilerArgs as List<String>
if (isGradleVersionAtLeast(4, 6)) {
// Filter out the argument providers that are related to annotation processing and therefore already used by Kapt.
// This is done to avoid outputs intersections between Kapt and and javaCompile and make the up-to-date check for
// javaCompile more granular as it does not perform annotation processing:
if (kaptVariantData != null) {
options.compilerArgumentProviders.removeAll(kaptVariantData.annotationProcessorOptionProviders)
}
// Filter out the argument providers that are related to annotation processing and therefore already used by Kapt.
// This is done to avoid outputs intersections between Kapt and and javaCompile and make the up-to-date check for
// javaCompile more granular as it does not perform annotation processing:
if (kaptVariantData != null) {
options.compilerArgumentProviders.removeAll(kaptVariantData.annotationProcessorOptionProviders)
}
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptTask.kt
+2 -5
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.internal.tasks.TaskWithLocalState
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.cacheOnlyIfEnabledForKotlin
import org.jetbrains.kotlin.gradle.tasks.clearLocalState
import org.jetbrains.kotlin.gradle.tasks.isBuildCacheSupported
import org.jetbrains.kotlin.gradle.utils.isJavaFile
import java.io.File
import java.util.jar.JarFile
@@ -24,10 +23,8 @@ abstract class KaptTask : ConventionTask(), TaskWithLocalState {
init {
cacheOnlyIfEnabledForKotlin()
if (isBuildCacheSupported()) {
val reason = "Caching is disabled for kapt with 'kapt.useBuildCache'"
outputs.cacheIf(reason) { useBuildCache }
}
val reason = "Caching is disabled for kapt with 'kapt.useBuildCache'"
outputs.cacheIf(reason) { useBuildCache }
}
override fun localStateDirectories(): FileCollection = project.files()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+48 -58
View File
@@ -22,10 +22,7 @@ import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.plugins.MavenPluginConvention
import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.CompileClasspathNormalizer
import org.gradle.api.tasks.Delete
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.Upload
import org.gradle.api.tasks.*
import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.jvm.tasks.Jar
@@ -65,7 +62,7 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
protected val sourceSetName: String = kotlinCompilation.compilationName
protected val kotlinTask: TaskHolder<out T> = registerKotlinCompileTask()
protected val kotlinTask: TaskProvider<out T> = registerKotlinCompileTask()
protected val javaSourceSet: SourceSet? = (kotlinCompilation as? KotlinWithJavaCompilation<*>)?.javaSourceSet
@@ -80,7 +77,7 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
return File(project.buildDir, "classes/kotlin/$targetSubDirectory${kotlinCompilation.compilationName}")
}
private fun registerKotlinCompileTask(): TaskHolder<out T> {
private fun registerKotlinCompileTask(): TaskProvider<out T> {
val name = kotlinCompilation.compileKotlinTaskName
logger.kotlinDebug("Creating kotlin compile task $name")
@@ -91,7 +88,7 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
return doRegisterTask(project, name) {
it.description = taskDescription
it.mapClasspath { kotlinCompilation.compileDependencyFiles }
kotlinCompilation.output.addClassesDir { project.files(kotlinTask.doGetTask().destinationDir).builtBy(kotlinTask.doGetTask()) }
kotlinCompilation.output.addClassesDir { project.files(kotlinTask.get().destinationDir).builtBy(kotlinTask.get()) }
}
}
@@ -142,24 +139,20 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
val expectedClassesTaskName = "${kotlinCompilation.defaultSourceSetName}Classes"
project.tasks.run {
var shouldCreateTask = false
if (useLazyTaskConfiguration) {
try {
named(expectedClassesTaskName)
} catch (e: Exception) {
shouldCreateTask = true
}
} else {
shouldCreateTask = findByName(expectedClassesTaskName) == null
try {
named(expectedClassesTaskName)
} catch (e: UnknownDomainObjectException) {
shouldCreateTask = true
}
if (shouldCreateTask) {
registerTask(project, expectedClassesTaskName, IDEClassesTask::class.java) {
project.createOrRegisterTask(expectedClassesTaskName, IDEClassesTask::class.java) {
it.dependsOn(getByName(kotlinCompilation.compileAllTaskName))
}
}
}
}
protected abstract fun doRegisterTask(project: Project, taskName: String, configureAction: (T) -> (Unit)): TaskHolder<out T>
protected abstract fun doRegisterTask(project: Project, taskName: String, configureAction: (T) -> (Unit)): TaskProvider<out T>
}
internal class Kotlin2JvmSourceSetProcessor(
@@ -170,7 +163,11 @@ internal class Kotlin2JvmSourceSetProcessor(
) : KotlinSourceSetProcessor<KotlinCompile>(
project, tasksProvider, "Compiles the $kotlinCompilation.", kotlinCompilation
) {
override fun doRegisterTask(project: Project, taskName: String, configureAction: (KotlinCompile)->(Unit)): TaskHolder<out KotlinCompile> =
override fun doRegisterTask(
project: Project,
taskName: String,
configureAction: (KotlinCompile) -> (Unit)
): TaskProvider<out KotlinCompile> =
tasksProvider.registerKotlinJVMTask(project, taskName, kotlinCompilation, configureAction)
override fun doTargetSpecificProcessing() {
@@ -181,7 +178,7 @@ internal class Kotlin2JvmSourceSetProcessor(
ScriptingGradleSubplugin.configureForSourceSet(project, kotlinCompilation.compilationName)
project.runOnceAfterEvaluated("Kotlin2JvmSourceSetProcessor.doTargetSpecificProcessing", kotlinTask) {
val kotlinTaskInstance = kotlinTask.doGetTask()
val kotlinTaskInstance = kotlinTask.get()
val javaTask = javaSourceSet?.let { project.tasks.findByName(it.compileJavaTaskName) as JavaCompile }
val subpluginEnvironment = SubpluginEnvironment.loadSubplugins(project, kotlinPluginVersion)
@@ -249,11 +246,13 @@ internal class Kotlin2JsSourceSetProcessor(
project: Project,
taskName: String,
configureAction: (Kotlin2JsCompile) -> (Unit)
): TaskHolder<out Kotlin2JsCompile> =
): TaskProvider<out Kotlin2JsCompile> =
tasksProvider.registerKotlinJSTask(project, taskName, kotlinCompilation, configureAction)
override fun doTargetSpecificProcessing() {
project.tasks.findByName(kotlinCompilation.compileAllTaskName)!!.dependsOn(kotlinTask.getTaskOrProvider())
project.tasks.named(kotlinCompilation.compileAllTaskName).configure {
it.dependsOn(kotlinTask)
}
registerCleanSourceMapTask()
@@ -263,7 +262,7 @@ internal class Kotlin2JsSourceSetProcessor(
// outputFile can be set later during the configuration phase, get it only after the phase:
project.runOnceAfterEvaluated("Kotlin2JsSourceSetProcessor.doTargetSpecificProcessing", kotlinTask) {
val kotlinTaskInstance = kotlinTask.doGetTask()
val kotlinTaskInstance = kotlinTask.get()
kotlinTaskInstance.kotlinOptions.outputFile = kotlinTaskInstance.outputFile.absolutePath
val outputDir = kotlinTaskInstance.outputFile.parentFile
@@ -291,9 +290,9 @@ internal class Kotlin2JsSourceSetProcessor(
private fun registerCleanSourceMapTask() {
val taskName = kotlinCompilation.composeName("clean", "sourceMap")
registerTask(project, taskName, Delete::class.java) {
it.onlyIf { kotlinTask.doGetTask().kotlinOptions.sourceMap }
it.onlyIf { kotlinTask.get().kotlinOptions.sourceMap }
it.delete(object : Closure<String>(this) {
override fun call(): String? = (kotlinTask.doGetTask().property("outputFile") as File).canonicalPath + ".map"
override fun call(): String? = (kotlinTask.get().property("outputFile") as File).canonicalPath + ".map"
})
}
project.tasks.findByName("clean")?.dependsOn(taskName)
@@ -310,14 +309,14 @@ internal class KotlinCommonSourceSetProcessor(
kotlinCompilation = compilation
) {
override fun doTargetSpecificProcessing() {
project.tasks.findByName(kotlinCompilation.compileAllTaskName)!!.dependsOn(kotlinTask.getTaskOrProvider())
project.tasks.findByName(kotlinCompilation.compileAllTaskName)!!.dependsOn(kotlinTask)
// can be missing (e.g. in case of tests)
if (kotlinCompilation.compilationName == KotlinCompilation.MAIN_COMPILATION_NAME) {
project.tasks.findByName(kotlinCompilation.target.artifactsTaskName)?.dependsOn(kotlinTask.getTaskOrProvider())
project.tasks.findByName(kotlinCompilation.target.artifactsTaskName)?.dependsOn(kotlinTask)
}
project.runOnceAfterEvaluated("KotlinCommonSourceSetProcessor.doTargetSpecificProcessing", kotlinTask) {
val kotlinTaskInstance = kotlinTask.doGetTask()
val kotlinTaskInstance = kotlinTask.get()
val subpluginEnvironment: SubpluginEnvironment = SubpluginEnvironment.loadSubplugins(project, kotlinPluginVersion)
val appliedPlugins = subpluginEnvironment.addSubpluginOptions(
project, kotlinTaskInstance, null, null, null, kotlinCompilation
@@ -329,7 +328,11 @@ internal class KotlinCommonSourceSetProcessor(
}
// protected abstract fun doRegisterTask(project: Project, taskName: String, configureAction: (T) -> (Unit)): TaskHolder<out T>
override fun doRegisterTask(project: Project, taskName: String, configureAction: (KotlinCompileCommon) -> (Unit)): TaskHolder<out KotlinCompileCommon> =
override fun doRegisterTask(
project: Project,
taskName: String,
configureAction: (KotlinCompileCommon) -> (Unit)
): TaskProvider<out KotlinCompileCommon> =
tasksProvider.registerKotlinCommonTask(project, taskName, kotlinCompilation, configureAction)
}
@@ -430,7 +433,7 @@ internal abstract class AbstractKotlinPlugin(
it.jarTask = jarTask
it.dependsOn(classesTask)
}
jarTask.dependsOn(inspectTask.getTaskOrProvider())
jarTask.dependsOn(inspectTask)
}
internal fun setUpJavaSourceSets(
@@ -532,30 +535,21 @@ internal abstract class AbstractKotlinPlugin(
internal fun configureDefaultVersionsResolutionStrategy(project: Project, kotlinPluginVersion: String) {
project.configurations.all { configuration ->
if (isGradleVersionAtLeast(4, 4)) {
fun MutableVersionConstraint.chooseVersion(version: String) {
if (isGradleVersionAtLeast(5, 0)) {
// In Gradle 5.0, the semantics of 'prefer' has changed to be much less imperative, and now it's 'require' that we need:
val requireMethod = javaClass.getMethod("require", String::class.java)
requireMethod(this, version)
} else {
prefer(version)
}
fun MutableVersionConstraint.chooseVersion(version: String) {
if (isGradleVersionAtLeast(5, 0)) {
// In Gradle 5.0, the semantics of 'prefer' has changed to be much less imperative, and now it's 'require' that we need:
val requireMethod = javaClass.getMethod("require", String::class.java)
requireMethod(this, version)
} else {
prefer(version)
}
}
// Use the API introduced in Gradle 4.4 to modify the dependencies directly before they are resolved:
configuration.withDependencies { dependencySet ->
dependencySet.filterIsInstance<ExternalDependency>()
.filter { it.group == "org.jetbrains.kotlin" && it.version.isNullOrEmpty() }
.forEach { it.version { constraint -> constraint.chooseVersion(kotlinPluginVersion) } }
}
} else {
configuration.resolutionStrategy.eachDependency { details ->
val requested = details.requested
if (requested.group == "org.jetbrains.kotlin" && requested.version.isNullOrEmpty()) {
details.useVersion(kotlinPluginVersion)
}
}
// Use the API introduced in Gradle 4.4 to modify the dependencies directly before they are resolved:
configuration.withDependencies { dependencySet ->
dependencySet.filterIsInstance<ExternalDependency>()
.filter { it.group == "org.jetbrains.kotlin" && it.version.isNullOrEmpty() }
.forEach { it.version { constraint -> constraint.chooseVersion(kotlinPluginVersion) } }
}
}
}
@@ -995,13 +989,9 @@ internal fun configureJavaTask(kotlinTask: KotlinCompile, javaTask: AbstractComp
// Make Gradle check if the javaTask is up-to-date based on the Kotlin classes
javaTask.inputsCompatible.run {
if (isBuildCacheSupported()) {
dir(kotlinTask.destinationDir)
.withNormalizer(CompileClasspathNormalizer::class.java)
.withPropertyName("${kotlinTask.name}OutputClasses")
} else {
dirCompatible(kotlinTask.destinationDir)
}
dir(kotlinTask.destinationDir)
.withNormalizer(CompileClasspathNormalizer::class.java)
.withPropertyName("${kotlinTask.name}OutputClasses")
}
// Also, use kapt1 annotations file for up-to-date check since annotation processing is done with javac
javaTask.dependsOn(kotlinTask)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyTaskHolder.kt
-29
View File
@@ -1,29 +0,0 @@
/*
* Copyright 2010-2019 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.plugin
import org.gradle.api.Project
import org.gradle.api.Task
class LegacyTaskHolder<out T : Task>(private val task: T) : TaskHolder<T> {
override val project: Project
get() = task.project
override val name: String
get() = task.name
override fun doGetTask() = task
override fun getTaskOrProvider(): Any = task
override fun configure(action: (T) -> (Unit)) {
with(task, action)
}
override fun toString(): String {
return "TaskHolder instance: [className: ${javaClass.name}, task name: '${doGetTask().name}']"
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/RunOnceAfterEvaluated.kt
+3 -2
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Project
import org.gradle.api.logging.Logging
import org.gradle.api.tasks.TaskProvider
/**
* This class encapsulated logic which should be invoked during not before the script evaluation is ready and
@@ -44,12 +45,12 @@ internal class RunOnceAfterEvaluated(private val name: String, private val actio
}
}
internal fun Project.runOnceAfterEvaluated(name: String, task: TaskHolder<*>, action: () -> (Unit)) {
internal fun Project.runOnceAfterEvaluated(name: String, task: TaskProvider<*>, action: () -> (Unit)) {
val runOnce = RunOnceAfterEvaluated(name, action)
runOnceAfterEvaluated(runOnce, task)
}
internal fun Project.runOnceAfterEvaluated(runOnce: RunOnceAfterEvaluated, task: TaskHolder<*>) {
internal fun Project.runOnceAfterEvaluated(runOnce: RunOnceAfterEvaluated, task: TaskProvider<*>) {
if (state.executed) {
runOnce.onEvaluated()
} else {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskHolder.kt
-46
View File
@@ -1,46 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Task
import org.gradle.api.Project
/**
* Reference to a org.gradle.api.Task or org.gradle.api.TaskProvider necessary in order to support flexible creation of tasks.
* For gradle versions < 4.9 tasks are created meanwhile for gradle with version >= 4.9 tasks are registered
*/
interface TaskHolder<out T : Task> {
val project: Project
val name: String
/**
* Returns Task itself if task was created or TaskProvider<Task> if task was registered.
*/
fun getTaskOrProvider(): Any
/**
* Returns instance of task. If task created using lazy api, it will be instantiated
*/
fun doGetTask(): T
/**
* Invokes task configuration. If task was registered the configuration action is added but not invoked
*/
fun configure(action: (T) -> (Unit))
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskProviderHolder.kt
-39
View File
@@ -1,39 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.tasks.TaskProvider
class TaskProviderHolder<out T : Task>(
override val name: String,
override val project: Project,
private val provider: TaskProvider<T>
) : TaskHolder<T> {
override fun getTaskOrProvider(): Any = provider
override fun doGetTask(): T = provider.get()
override fun configure(action: (T) -> (Unit)) {
provider.configure(action)
}
override fun toString(): String {
return "TaskProviderHolder instance: [className: ${javaClass.name}, task name: '$name']"
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
+1 -5
View File
@@ -161,10 +161,6 @@ class KotlinMultiplatformPlugin(
SingleWarningPerBuild.show(project, GRADLE_NO_METADATA_WARNING)
}
if (!isGradleVersionAtLeast(4, 8) && project.multiplatformExtension.isGradleMetadataAvailable) {
SingleWarningPerBuild.show(project, GRADLE_OLD_METADATA_WARNING)
}
val targets = project.multiplatformExtension.targets
val kotlinSoftwareComponent = project.multiplatformExtension.rootSoftwareComponent
@@ -178,7 +174,7 @@ class KotlinMultiplatformPlugin(
}
// Publish the root publication only if Gradle metadata publishing is enabled:
project.tasks.withType(AbstractPublishToMaven::class.java).all { publishTask ->
project.tasks.withType(AbstractPublishToMaven::class.java).configureEach { publishTask ->
publishTask.onlyIf { publishTask.publication != rootPublication || project.multiplatformExtension.isGradleMetadataAvailable }
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.ProjectLocalConfigurations
open class KotlinSoftwareComponent(
abstract class KotlinSoftwareComponent(
private val name: String,
protected val kotlinTargets: Iterable<KotlinTarget>
) : SoftwareComponentInternal, ComponentWithVariants {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+2 -1
View File
@@ -10,6 +10,7 @@ import org.gradle.api.Project
import org.gradle.api.attributes.AttributeContainer
import org.gradle.api.file.FileCollection
import org.gradle.api.plugins.BasePluginConvention
import org.gradle.api.tasks.TaskProvider
import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.plugin.*
@@ -47,7 +48,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
override val compileKotlinTask: KotlinCompile<T>
get() = (target.project.tasks.getByName(compileKotlinTaskName) as KotlinCompile<T>)
val compileKotlinTaskHolder: TaskHolder<KotlinCompile<T>>
val compileKotlinTaskHolder: TaskProvider<KotlinCompile<T>>
get() = target.project.locateTask(compileKotlinTaskName)!!
// Don't declare this property in the constructor to avoid NPE
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
+1 -5
View File
@@ -67,11 +67,7 @@ abstract class AbstractKotlinTarget(
targetName
else PRIMARY_SINGLE_COMPONENT_NAME
val result = if (isGradleVersionAtLeast(4, 7)) {
createKotlinVariant(componentName, mainCompilation, usageContexts)
} else {
KotlinVariant(mainCompilation, usageContexts)
}
val result = createKotlinVariant(componentName, mainCompilation, usageContexts)
result.sourcesArtifacts = setOf(
sourcesJarArtifact(mainCompilation, componentName, dashSeparatedName(targetName.toLowerCase()))
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin.sources
import org.gradle.api.InvalidUserDataException
import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.LanguageFeature
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt
+2 -6
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.useLazyTaskConfiguration
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource
@@ -81,11 +80,8 @@ class ScriptingGradleSubplugin : Plugin<Project> {
}
}
}
if (useLazyTaskConfiguration) {
project.tasks.withType(KotlinCompile::class.java).configureEach(configureAction)
} else {
project.tasks.withType(KotlinCompile::class.java, configureAction)
}
project.tasks.withType(KotlinCompile::class.java).configureEach(configureAction)
} else {
// TODO: implement support for discovery in MPP project: use KotlinSourceSet directly and do not rely on java convevtion sourcesets
if (project.multiplatformExtensionOrNull == null) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
+2 -2
View File
@@ -129,12 +129,12 @@ class Android25ProjectHandler(
}
// TODO the return type is actually `AbstractArchiveTask | TaskProvider<out AbstractArchiveTask>`;
// change the signature once the Gradle versions that don't support task providers (< 4.8) are dropped
// change the signature once the Android Gradle plugin versions that don't support task providers are dropped
override fun getLibraryOutputTask(variant: BaseVariant): Any? {
val getPackageLibraryProvider = variant.javaClass.methods
.find { it.name == "getPackageLibraryProvider" && it.parameterCount == 0 }
return if (getPackageLibraryProvider != null && isGradleVersionAtLeast(4, 8)) {
return if (getPackageLibraryProvider != null) {
@Suppress("UNCHECKED_CAST")
getPackageLibraryProvider(variant) as TaskProvider<out AbstractArchiveTask>
} else {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
-3
View File
@@ -94,9 +94,6 @@ open class KotlinAndroidTarget(
// Capture the type parameter T for `AbstractAndroidProjectHandler`
private fun <T> AbstractAndroidProjectHandler<T>.doCreateComponents(): Set<KotlinTargetComponent> {
if (!isGradleVersionAtLeast(4, 7))
return emptySet()
val publishableVariants = mutableListOf<T>()
.apply { forEachVariant(project) { add(it) } }
.toList() // Defensive copy against unlikely modification by the lambda that captures the list above in forEachVariant { }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
@@ -30,7 +31,7 @@ class KotlinJsTarget(project: Project, platformType: KotlinPlatformType) :
internal set
val testTaskName get() = testRuns.getByName(KotlinTargetWithTests.DEFAULT_TEST_RUN_NAME).testTaskName
val testTask: TaskHolder<KotlinTestReport>
val testTask: TaskProvider<KotlinTestReport>
get() = checkNotNull(project.locateTask(testTaskName))
val runTaskName get() = lowerCamelCaseName(disambiguationClassifier, runTaskNameSuffix)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
+1 -2
View File
@@ -40,8 +40,7 @@ open class KotlinJsTargetConfigurator(kotlinPluginVersion: String) :
}
}
@Suppress("UNCHECKED_CAST")
result.executionTask = testTask.getTaskOrProvider() as TaskProvider<KotlinTestReport>
result.executionTask = testTask
return result
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt
+1 -1
View File
@@ -32,7 +32,7 @@ internal class DukatCompilationResolverPlugin(
it.dependsOn(nodeJs.npmInstallTask, npmProject.packageJsonTask)
}
compilation.compileKotlinTask.dependsOn(task.getTaskOrProvider())
compilation.compileKotlinTask.dependsOn(task)
}
override fun hookDependencies(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
+2 -2
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.nodejs
import org.gradle.api.tasks.AbstractExecTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.jetbrains.kotlin.gradle.plugin.TaskHolder
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
@@ -53,7 +53,7 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
compilation: KotlinJsCompilation,
name: String,
configuration: NodeJsExec.() -> Unit = {}
): TaskHolder<NodeJsExec> {
): TaskProvider<NodeJsExec> {
val target = compilation.target
val project = target.project
val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+1 -1
View File
@@ -74,7 +74,7 @@ internal class KotlinCompilationNpmResolver(
@Synchronized
fun getResolutionOrResolveIfForced(): KotlinCompilationNpmResolution? {
if (resolution != null) return resolution
if (packageJsonTaskHolder.doGetTask().state.upToDate) return resolve(skipWriting = true)
if (packageJsonTaskHolder.get().state.upToDate) return resolve(skipWriting = true)
if (resolver.forceFullResolve && resolution == null) return resolve()
return null
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
+1 -1
View File
@@ -105,7 +105,7 @@ internal class KotlinProjectNpmResolver(
projectNpmResolver.project.tasks.forEach { task ->
if (task.enabled && task is RequiresNpmDependencies) {
addTaskRequirements(task)
task.dependsOn(projectNpmResolver[task.compilation].packageJsonTaskHolder.getTaskOrProvider())
task.dependsOn(projectNpmResolver[task.compilation].packageJsonTaskHolder)
task.dependsOn(projectNpmResolver.resolver.nodeJs.npmInstallTask)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
+4 -8
View File
@@ -7,11 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js.npm.tasks
import org.gradle.api.DefaultTask
import org.gradle.api.plugins.BasePlugin
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Nested
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import org.jetbrains.kotlin.gradle.plugin.TaskHolder
import org.gradle.api.tasks.*
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
@@ -49,7 +45,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
}
companion object {
fun create(compilation: KotlinJsCompilation): TaskHolder<KotlinPackageJsonTask> {
fun create(compilation: KotlinJsCompilation): TaskProvider<KotlinPackageJsonTask> {
val target = compilation.target
val project = target.project
val npmProject = compilation.npmProject
@@ -68,11 +64,11 @@ open class KotlinPackageJsonTask : DefaultTask() {
task.mustRunAfter(rootClean)
}
npmInstallTask.mustRunAfter(rootClean, packageJsonTask.getTaskOrProvider())
npmInstallTask.mustRunAfter(rootClean, packageJsonTask)
compilation.compileKotlinTask.dependsOn(
npmInstallTask,
packageJsonTask.getTaskOrProvider()
packageJsonTask
)
return packageJsonTask
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+1 -1
View File
@@ -75,6 +75,6 @@ class KotlinBrowserJs(target: KotlinJsTarget) :
it.outputs.upToDateWhen { false }
}
target.runTask.dependsOn(run.getTaskOrProvider())
target.runTask.dependsOn(run)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
+3 -2
View File
@@ -93,12 +93,13 @@ abstract class KotlinJsSubTarget(
testJs.configureConventions()
}
testRun.executionTask = testJs.getTaskOrProvider() as TaskProvider<KotlinJsTest>
testRun.executionTask = testJs
target.testRuns.matching { it.name == testRun.name }.all { parentTestRun ->
target.project.kotlinTestRegistry.registerTestTask(
project,
testJs,
parentTestRun.executionTask.get()
parentTestRun.executionTask
)
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
+1 -1
View File
@@ -28,6 +28,6 @@ class KotlinNodeJs(target: KotlinJsTarget) :
override fun configureRun(compilation: KotlinJsCompilation) {
val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased("run"))
target.runTask.dependsOn(runTaskHolder.getTaskOrProvider())
target.runTask.dependsOn(runTaskHolder)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt
+2 -2
View File
@@ -33,7 +33,7 @@ class KotlinJvmTargetConfigurator(kotlinPluginVersion: String) :
testTask.project.tasks.findByName(JavaBasePlugin.CHECK_TASK_NAME)?.dependsOn(testTask)
}
executionTask = testTaskOrProvider.getTaskOrProvider() as TaskProvider<KotlinJvmTest>
executionTask = testTaskOrProvider
val testCompilation = target.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME)
@@ -47,7 +47,7 @@ class KotlinJvmTargetConfigurator(kotlinPluginVersion: String) :
}
}
target.project.kotlinTestRegistry.registerTestTask(testTaskOrProvider)
target.project.kotlinTestRegistry.registerTestTask(target.project, testTaskOrProvider)
}
override fun buildCompilationProcessor(compilation: KotlinJvmCompilation): KotlinSourceSetProcessor<*> {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
+9 -8
View File
@@ -11,6 +11,7 @@ import org.gradle.api.attributes.Usage
import org.gradle.api.file.FileCollection
import org.gradle.api.internal.component.SoftwareComponentInternal
import org.gradle.api.plugins.BasePlugin
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.bundling.Jar
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
@@ -132,7 +133,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
}
sourceSetsWithMetadataCompilations.forEach { (sourceSet, metadataCompilation) ->
val compileMetadataTransformationTasksForHierarchy = mutableSetOf<TaskHolder<TransformKotlinGranularMetadata>>()
val compileMetadataTransformationTasksForHierarchy = mutableSetOf<TaskProvider<TransformKotlinGranularMetadata>>()
// Adjust metadata compilation to support source set hierarchies, i.e. use both the outputs of dependsOn source set compilation
// and their dependencies metadata transformed for compilation:
@@ -156,8 +157,8 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
val generateMetadata = createGenerateProjectStructureMetadataTask()
allMetadataJar.from(project.files(Callable {
generateMetadata.doGetTask().resultXmlFile
}).builtBy(generateMetadata.getTaskOrProvider())) { spec ->
generateMetadata.get().resultXmlFile
}).builtBy(generateMetadata)) { spec ->
spec.into("META-INF").rename { MULTIPLATFORM_PROJECT_METADATA_FILE_NAME }
}
}
@@ -286,13 +287,13 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
private fun createTransformedMetadataClasspath(
fromFiles: Iterable<File>,
project: Project,
transformationTaskHolders: Set<TaskHolder<TransformKotlinGranularMetadata>>
transformationTaskHolders: Set<TaskProvider<TransformKotlinGranularMetadata>>
): FileCollection {
return project.files(Callable {
val allResolutionsByArtifactFile: Map<File, Iterable<MetadataDependencyResolution>> =
mutableMapOf<File, MutableList<MetadataDependencyResolution>>().apply {
transformationTaskHolders.forEach {
val resolutions = it.doGetTask().metadataDependencyResolutions
val resolutions = it.get().metadataDependencyResolutions
resolutions.forEach { resolution ->
val artifacts = resolution.dependency.moduleArtifacts.map { it.file }
@@ -305,7 +306,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
}
val transformedFilesByResolution: Map<MetadataDependencyResolution, FileCollection> =
transformationTaskHolders.flatMap { it.doGetTask().filesByResolution.toList() }.toMap()
transformationTaskHolders.flatMap { it.get().filesByResolution.toList() }.toMap()
mutableSetOf<Any /* File | FileCollection */>().apply {
fromFiles.forEach { file ->
@@ -324,7 +325,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
}
}
}
}).builtBy(transformationTaskHolders.map { it.getTaskOrProvider() })
}).builtBy(transformationTaskHolders)
}
private fun getPublishedCommonSourceSets(project: Project): Set<KotlinSourceSet> {
@@ -346,7 +347,7 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
.keys
}
private fun Project.createGenerateProjectStructureMetadataTask(): TaskHolder<GenerateProjectStructureMetadata> =
private fun Project.createGenerateProjectStructureMetadataTask(): TaskProvider<GenerateProjectStructureMetadata> =
project.createOrRegisterTask("generateProjectStructureMetadata") { task ->
task.lazyKotlinProjectStructureMetadata = lazy { checkNotNull(buildKotlinProjectStructureMetadata(project)) }
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetPreset.kt
+3 -6
View File
@@ -9,10 +9,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.sources.applyLanguageSettingsToKotlinTask
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
@@ -49,9 +46,9 @@ class KotlinMetadataTargetPreset(
mainCompilation.source(commonMainSourceSet)
project.afterEvaluate {
project.whenEvaluated {
// Since there's no default source set, apply language settings from commonMain:
val compileKotlinMetadata = project.tasks.getByName(mainCompilation.compileKotlinTaskName) as KotlinCompile<*>
val compileKotlinMetadata = mainCompilation.compileKotlinTask
applyLanguageSettingsToKotlinTask(commonMainSourceSet.languageSettings, compileKotlinMetadata)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt
+1 -4
View File
@@ -29,12 +29,9 @@ open class KotlinNativeTarget(
attributes.attribute(konanTargetAttribute, konanTarget.name)
}
val binaries = if(isGradleVersionAtLeast(4, 2)) {
val binaries =
// Use newInstance to allow accessing binaries by their names in Groovy using the extension mechanism.
project.objects.newInstance(KotlinNativeBinaryContainer::class.java, this, WrapUtil.toDomainObjectSet(NativeBinary::class.java))
} else {
KotlinNativeBinaryContainer(this, WrapUtil.toDomainObjectSet(NativeBinary::class.java))
}
fun binaries(configure: KotlinNativeBinaryContainer.() -> Unit) {
binaries.configure()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
+2 -3
View File
@@ -412,11 +412,10 @@ class KotlinNativeTargetWithTestsConfigurator(kotlinPluginVersion: String)
testTask.configureConventions()
}
@Suppress("UNCHECKED_CAST")
executionTask = testTaskOrProvider.getTaskOrProvider() as TaskProvider<KotlinNativeTest>
executionTask = testTaskOrProvider
setExecutionSourceFrom(target.binaries.getTest(NativeBuildType.DEBUG))
project.kotlinTestRegistry.registerTestTask(testTaskOrProvider)
project.kotlinTestRegistry.registerTestTask(project, testTaskOrProvider)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CacheableTasks.kt
+2 -15
View File
@@ -20,24 +20,11 @@ import org.gradle.api.Task
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.utils.outputsCompatible
internal fun isBuildCacheSupported(): Boolean =
gradleVersion >= GradleVersion.version("4.3")
internal fun isWorkerAPISupported(): Boolean =
gradleVersion >= GradleVersion.version("4.3")
internal fun isBuildCacheEnabledForKotlin(): Boolean =
isBuildCacheSupported() &&
System.getProperty(KOTLIN_CACHING_ENABLED_PROPERTY)?.toBoolean() ?: true
System.getProperty(KOTLIN_CACHING_ENABLED_PROPERTY)?.toBoolean() ?: true
internal fun <T : Task> T.cacheOnlyIfEnabledForKotlin() {
// The `cacheIf` method may be missing if the Gradle version is too low:
try {
outputsCompatible.cacheIf { isBuildCacheEnabledForKotlin() }
} catch (_: NoSuchMethodError) {
}
outputsCompatible.cacheIf { isBuildCacheEnabledForKotlin() }
}
private val gradleVersion = GradleVersion.current()
private const val KOTLIN_CACHING_ENABLED_PROPERTY = "kotlin.caching.enabled"
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt
+28 -56
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.UnknownTaskException
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinCompilation
@@ -26,73 +27,46 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.defaultSourceSetName
import org.jetbrains.kotlin.gradle.plugin.sources.applyLanguageSettingsToKotlinTask
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
internal val useLazyTaskConfiguration = org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast(4, 9)
internal val canLocateTask = org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast(5, 0)
/**
* Registers the task with [name] and [type] and initialization script [body]
* If Gradle with version <4.9 is used the task will be created
*/
@JvmName("registerTaskOld")
@Deprecated("please use Project.createOrRegisterTask", ReplaceWith("project.createOrRegisterTask(name, body)"))
internal fun <T : Task> registerTask(project: Project, name: String, type: Class<T>, body: (T) -> (Unit)): TaskHolder<T> =
internal fun <T : Task> registerTask(project: Project, name: String, type: Class<T>, body: (T) -> (Unit)): TaskProvider<T> =
project.createOrRegisterTask(name, type, emptyList(), body)
internal inline fun <reified T : Task> Project.createOrRegisterTask(
name: String,
args: List<Any> = emptyList(),
noinline body: (T) -> (Unit)
): TaskHolder<T> =
): TaskProvider<T> =
createOrRegisterTask(name, T::class.java, args, body)
internal fun <T : Task> Project.createOrRegisterTask(
name: String,
type: Class<T>,
constructorArgs: List<Any> = emptyList(), // note: args are only allowed with Gradle 4.7+
constructorArgs: List<Any> = emptyList(),
body: (T) -> (Unit)
): TaskHolder<T> {
return if (useLazyTaskConfiguration) {
val provider = project.tasks.register(name, type, *constructorArgs.toTypedArray()).apply { configure(body) }
TaskProviderHolder(name, project, provider)
} else {
val result = LegacyTaskHolder(if (constructorArgs.isEmpty()) {
project.tasks.create(name, type)
} else {
if (!isGradleVersionAtLeast(4, 7)) {
error("Cannot inject the arguments list into a task. This requires Gradle 4.7+.")
}
project.tasks.create(name, type, *constructorArgs.toTypedArray())
})
with(result.doGetTask(), body)
result
}
): TaskProvider<T> {
return project.tasks.register(name, type, *constructorArgs.toTypedArray()).apply { configure(body) }
}
/**
* Locates a task by [name] and [type], without triggering its creation or configuration.
*/
internal inline fun <reified T : Task> Project.locateTask(name: String): TaskHolder<T>? =
if (canLocateTask) {
try {
TaskProviderHolder(name, this, tasks.named(name, T::class.java))
} catch (e: UnknownTaskException) {
null
}
} else {
tasks.findByName(name)?.let {
check(T::class.java.isInstance(it))
@Suppress("UNCHECKED_CAST")
LegacyTaskHolder(it as T)
}
internal inline fun <reified T : Task> Project.locateTask(name: String): TaskProvider<T>? =
try {
tasks.withType(T::class.java).named(name)
} catch (e: UnknownTaskException) {
null
}
/**
* Locates a task by [name] and [type], without triggering its creation or configuration or registers new task
* with [name], type [T] and initialization script [body]
*/
internal inline fun <reified T : Task> Project.locateOrRegisterTask(name: String, noinline body: (T) -> (Unit)): TaskHolder<T> {
internal inline fun <reified T : Task> Project.locateOrRegisterTask(name: String, noinline body: (T) -> (Unit)): TaskProvider<T> {
return project.locateTask(name) ?: registerTask(project, name, T::class.java, body)
}
@@ -102,7 +76,7 @@ internal open class KotlinTasksProvider(val targetName: String) {
name: String,
compilation: AbstractKotlinCompilation<*>,
configureAction: (KotlinCompile) -> (Unit)
): TaskHolder<out KotlinCompile> {
): TaskProvider<out KotlinCompile> {
val properties = PropertiesProvider(project)
val taskClass = taskOrWorkersTask<KotlinCompile, KotlinCompileWithWorkers>(properties)
val result = registerTask(project, name, taskClass) {
@@ -117,10 +91,10 @@ internal open class KotlinTasksProvider(val targetName: String) {
name: String,
compilation: AbstractKotlinCompilation<*>,
configureAction: (Kotlin2JsCompile) -> Unit
): TaskHolder<Kotlin2JsCompile> {
): TaskProvider<out Kotlin2JsCompile> {
val properties = PropertiesProvider(project)
val taskClass = taskOrWorkersTask<Kotlin2JsCompile, Kotlin2JsCompileWithWorkers>(properties)
val result = registerTask(project, name, taskClass) {
val result = project.createOrRegisterTask(name, taskClass) {
configureAction(it)
}
configure(result, project, properties, compilation)
@@ -132,10 +106,10 @@ internal open class KotlinTasksProvider(val targetName: String) {
name: String,
compilation: AbstractKotlinCompilation<*>,
configureAction: (KotlinCompileCommon) -> (Unit)
): TaskHolder<KotlinCompileCommon> {
): TaskProvider<out KotlinCompileCommon> {
val properties = PropertiesProvider(project)
val taskClass = taskOrWorkersTask<KotlinCompileCommon, KotlinCompileCommonWithWorkers>(properties)
val result = registerTask(project, name, taskClass) {
val result = project.createOrRegisterTask(name, taskClass) {
configureAction(it)
}
configure(result, project, properties, compilation)
@@ -143,25 +117,23 @@ internal open class KotlinTasksProvider(val targetName: String) {
}
open fun configure(
kotlinTaskHolder: TaskHolder<AbstractKotlinCompile<*>>,
kotlinTaskHolder: TaskProvider<out AbstractKotlinCompile<*>>,
project: Project,
propertiesProvider: PropertiesProvider,
compilation: AbstractKotlinCompilation<*>
) {
val configureAfterEvaluated = RunOnceAfterEvaluated("TaskProvider.configure") {
val languageSettings = project.kotlinExtension.sourceSets.findByName(compilation.defaultSourceSetName)?.languageSettings
?: return@RunOnceAfterEvaluated
val kotlinTask = kotlinTaskHolder.doGetTask()
kotlinTask as org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>
applyLanguageSettingsToKotlinTask(languageSettings, kotlinTask)
}
kotlinTaskHolder.configure {
it.friendTaskName = taskToFriendTaskMapper[it]
propertiesProvider.mapKotlinTaskProperties(it)
configureAfterEvaluated.onConfigure()
}
project.runOnceAfterEvaluated(configureAfterEvaluated, kotlinTaskHolder)
project.runOnceAfterEvaluated("apply properties and language settings to ${kotlinTaskHolder.name}", kotlinTaskHolder) {
propertiesProvider.mapKotlinTaskProperties(kotlinTaskHolder.get())
applyLanguageSettingsToKotlinTask(
compilation.defaultSourceSet.languageSettings,
kotlinTaskHolder.get() as org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>
)
}
}
protected open val taskToFriendTaskMapper: TaskToFriendTaskMapper =
@@ -176,7 +148,7 @@ internal class AndroidTasksProvider(targetName: String) : KotlinTasksProvider(ta
RegexTaskToFriendTaskMapper.Android(targetName)
override fun configure(
kotlinTaskHolder: TaskHolder<AbstractKotlinCompile<*>>,
kotlinTaskHolder: TaskProvider<out AbstractKotlinCompile<*>>,
project: Project,
propertiesProvider: PropertiesProvider,
compilation: AbstractKotlinCompilation<*>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt
+26 -14
View File
@@ -10,6 +10,7 @@ import org.gradle.api.execution.TaskExecutionGraph
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.testing.*
import org.jetbrains.kotlin.gradle.internal.testing.KotlinTestRunnerListener
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
@@ -41,12 +42,12 @@ import java.net.URI
*/
open class KotlinTestReport : TestReport() {
@Internal
val testTasks = mutableListOf<AbstractTestTask>()
val testTasks = mutableListOf<TaskProvider<out AbstractTestTask>>()
private var parent: KotlinTestReport? = null
@Internal
val children = mutableListOf<KotlinTestReport>()
val children = mutableListOf<TaskProvider<KotlinTestReport>>()
private val projectProperties = PropertiesProvider(project)
@@ -61,7 +62,7 @@ open class KotlinTestReport : TestReport() {
private var hasOwnFailedTests = false
private val hasFailedTests: Boolean
get() = hasOwnFailedTests || children.any { it.hasFailedTests }
get() = hasOwnFailedTests || children.map { it.get() }.any { it.hasFailedTests }
private val ownSuppressedRunningFailures = mutableListOf<Pair<KotlinTest, Error>>()
@@ -82,15 +83,19 @@ open class KotlinTestReport : TestReport() {
}
}
fun addChild(child: KotlinTestReport) {
fun addChild(childProvider: TaskProvider<KotlinTestReport>) {
val child = childProvider.get()
check(child.parent == null) { "$child already registers as child of ${child.parent}" }
child.parent = this
children.add(child)
reportOnChildTasks(child)
children.add(childProvider)
reportOnChildTasks(childProvider)
}
private fun reportOnChildTasks(child: KotlinTestReport) {
private fun reportOnChildTasks(childProvider: TaskProvider<KotlinTestReport>): Unit {
val child = childProvider.get()
child.testTasks.forEach {
reportOn(it)
}
@@ -99,8 +104,11 @@ open class KotlinTestReport : TestReport() {
}
}
fun registerTestTask(task: AbstractTestTask) {
testTasks.add(task)
fun registerTestTask(taskProvider: TaskProvider<out AbstractTestTask>) {
testTasks.add(taskProvider)
val task = taskProvider.get()
task.addTestListener(failedTestsListener)
if (task is KotlinTest) task.addRunListener(object : KotlinTestRunnerListener {
override fun runningFailure(failure: Error) {
@@ -165,7 +173,7 @@ open class KotlinTestReport : TestReport() {
}
report.children.forEach {
visitSuppressedRunningFailures(it)
visitSuppressedRunningFailures(it.get())
}
}
@@ -227,13 +235,17 @@ open class KotlinTestReport : TestReport() {
disableTestReporting(it)
}
children.forEach {
it.checkFailedTests = false
it.disableIndividualTestTaskReportingAndFailing()
children.forEach { child ->
child.configure {
it.checkFailedTests = false
it.disableIndividualTestTaskReportingAndFailing()
}
}
}
private fun disableTestReporting(task: AbstractTestTask) {
private fun disableTestReporting(taskProvider: TaskProvider<out AbstractTestTask>) {
val task = taskProvider.get()
task.ignoreFailures = true
if (task is KotlinTest) {
task.ignoreRunFailures = true
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestsRegistry.kt
+21 -19
View File
@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.testing.internal
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.testing.AbstractTestTask
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.plugin.TaskHolder
import org.jetbrains.kotlin.gradle.tasks.createOrRegisterTask
import org.jetbrains.kotlin.gradle.tasks.locateTask
@@ -19,27 +19,28 @@ import org.jetbrains.kotlin.gradle.tasks.locateTask
* See [KotlinTestReport] for more details about aggregated test tasks.
*/
class KotlinTestsRegistry(val project: Project, val allTestsTaskName: String = "allTests") {
val allTestsTask: TaskHolder<KotlinTestReport>
val allTestsTask: TaskProvider<KotlinTestReport>
get() = doGetOrCreateAggregatedTestTask(
name = allTestsTaskName,
description = "Runs the tests for all targets and create aggregated report"
) {
project.tasks.maybeCreate(LifecycleBasePlugin.CHECK_TASK_NAME)
.dependsOn(it.getTaskOrProvider())
.dependsOn(it)
}
fun registerTestTask(
taskHolder: TaskHolder<AbstractTestTask>,
aggregate: KotlinTestReport = allTestsTask.doGetTask()
project: Project,
taskHolder: TaskProvider<out AbstractTestTask>,
aggregate: TaskProvider<KotlinTestReport> = allTestsTask
) {
val project = taskHolder.project
project.tasks.getByName(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(taskHolder.name)
project.cleanAllTestTask.dependsOn(cleanTaskName(taskHolder.name))
aggregate.dependsOn(taskHolder.name)
aggregate.configure {
it.dependsOn(taskHolder.name)
it.registerTestTask(taskHolder)
}
taskHolder.configure { task ->
aggregate.registerTestTask(task)
ijListenTestTask(task)
}
}
@@ -47,25 +48,25 @@ class KotlinTestsRegistry(val project: Project, val allTestsTaskName: String = "
fun getOrCreateAggregatedTestTask(
name: String,
description: String,
parent: TaskHolder<KotlinTestReport>? = allTestsTask
): TaskHolder<KotlinTestReport> {
parent: TaskProvider<KotlinTestReport>? = allTestsTask
): TaskProvider<KotlinTestReport> {
if (name == parent?.name) return parent
return doGetOrCreateAggregatedTestTask(name, description, parent?.doGetTask())
return doGetOrCreateAggregatedTestTask(name, description, parent)
}
private fun doGetOrCreateAggregatedTestTask(
name: String,
description: String,
parent: KotlinTestReport? = null,
configure: (TaskHolder<KotlinTestReport>) -> Unit = {}
): TaskHolder<KotlinTestReport> {
parent: TaskProvider<KotlinTestReport>? = null,
configure: (TaskProvider<KotlinTestReport>) -> Unit = {}
): TaskProvider<KotlinTestReport> {
val existed = project.locateTask<KotlinTestReport>(name)
if (existed != null) return existed
val reportName = name
val aggregate: TaskHolder<KotlinTestReport> = project.createOrRegisterTask(name) { aggregate ->
val aggregate: TaskProvider<KotlinTestReport> = project.createOrRegisterTask(name) { aggregate ->
aggregate.description = description
aggregate.group = JavaBasePlugin.VERIFICATION_GROUP
@@ -78,11 +79,12 @@ class KotlinTestsRegistry(val project: Project, val allTestsTaskName: String = "
project.gradle.taskGraph.whenReady { graph ->
aggregate.maybeOverrideReporting(graph)
}
parent?.addChild(aggregate)
}
parent?.dependsOn(aggregate.getTaskOrProvider())
parent?.configure {
it.addChild(aggregate)
it.dependsOn(aggregate)
}
configure(aggregate)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt
+1 -1
View File
@@ -51,7 +51,7 @@ internal fun TaskInputs.dirCompatible(dirPath: Any) {
inputsDirMethod(this, dirPath)
}
internal fun checkGradleCompatibility(minSupportedVersion: GradleVersion = GradleVersion.version("4.3")) {
internal fun checkGradleCompatibility(minSupportedVersion: GradleVersion = GradleVersion.version("4.9")) {
val currentVersion = GradleVersion.current()
if (currentVersion < minSupportedVersion) {
throw GradleException(