[Build] Bump Gradle to v6.8.3
#KTI-542 Fixed
This commit is contained in:
+9
-7
@@ -17,6 +17,7 @@ import org.gradle.process.internal.ExecHandle
|
||||
import org.jetbrains.kotlin.gradle.internal.LogType
|
||||
import org.jetbrains.kotlin.gradle.logging.kotlinDebug
|
||||
import org.jetbrains.kotlin.gradle.testing.KotlinTestFailure
|
||||
import org.jetbrains.kotlin.gradle.utils.LegacyTestDescriptorInternal
|
||||
import org.slf4j.Logger
|
||||
import java.text.ParseException
|
||||
|
||||
@@ -389,11 +390,12 @@ internal open class TCServiceMessagesClient(
|
||||
}
|
||||
|
||||
inner class RootNode(val ownerBuildOperationId: OperationIdentifier) : GroupNode(null, settings.rootNodeName) {
|
||||
override val descriptor: TestDescriptorInternal = object : DefaultTestSuiteDescriptor(settings.rootNodeName, localId) {
|
||||
override fun getOwnerBuildOperationId(): Any? = this@RootNode.ownerBuildOperationId
|
||||
override fun getParent(): TestDescriptorInternal? = null
|
||||
override fun toString(): String = name
|
||||
}
|
||||
override val descriptor: TestDescriptorInternal =
|
||||
object : DefaultTestSuiteDescriptor(settings.rootNodeName, localId), LegacyTestDescriptorInternal {
|
||||
override fun getOwnerBuildOperationId(): Any? = this@RootNode.ownerBuildOperationId
|
||||
override fun getParent(): TestDescriptorInternal? = null
|
||||
override fun toString(): String = name
|
||||
}
|
||||
|
||||
override fun requireReportingNode(): TestDescriptorInternal = descriptor
|
||||
|
||||
@@ -435,7 +437,7 @@ internal open class TCServiceMessagesClient(
|
||||
val reportingParent = parents.last() as RootNode
|
||||
this.reportingParent = reportingParent
|
||||
|
||||
descriptor = object : DefaultTestSuiteDescriptor(id, fullName) {
|
||||
descriptor = object : DefaultTestSuiteDescriptor(id, fullName), LegacyTestDescriptorInternal {
|
||||
override fun getDisplayName(): String = fullNameWithoutRoot
|
||||
override fun getClassName(): String? = fullNameWithoutRoot
|
||||
override fun getOwnerBuildOperationId(): Any? = rootOperationId
|
||||
@@ -481,7 +483,7 @@ internal open class TCServiceMessagesClient(
|
||||
private val parentDescriptor = (this@TestNode.parent as GroupNode).requireReportingNode()
|
||||
|
||||
override val descriptor: TestDescriptorInternal =
|
||||
object : DefaultTestDescriptor(id, className, methodName, classDisplayName, displayName) {
|
||||
object : DefaultTestDescriptor(id, className, methodName, classDisplayName, displayName), LegacyTestDescriptorInternal {
|
||||
override fun getOwnerBuildOperationId(): Any? = rootOperationId
|
||||
override fun getParent(): TestDescriptorInternal = parentDescriptor
|
||||
}
|
||||
|
||||
+14
@@ -24,10 +24,12 @@ import org.gradle.api.file.CopySpec
|
||||
import org.gradle.api.file.FileSystemOperations
|
||||
import org.gradle.api.file.FileTree
|
||||
import org.gradle.api.internal.project.ProjectInternal
|
||||
import org.gradle.api.internal.tasks.testing.TestDescriptorInternal
|
||||
import org.gradle.api.tasks.TaskInputs
|
||||
import org.gradle.api.tasks.TaskOutputs
|
||||
import org.gradle.api.tasks.WorkResult
|
||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
||||
import org.gradle.api.tasks.testing.TestDescriptor
|
||||
import org.gradle.util.GradleVersion
|
||||
import java.io.File
|
||||
|
||||
@@ -110,4 +112,16 @@ internal class FileSystemOperationsCompat(@Transient private val project: Projec
|
||||
else -> project.copy(action)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Gradle dropped out getOwnerBuildOperationId. Workaround to build correct plugin for Gradle < 6.8
|
||||
// See https://github.com/gradle/gradle/commit/0296f4441ae69ad608cfef6a90fef3fdf314fa2c
|
||||
internal interface LegacyTestDescriptorInternal : TestDescriptor {
|
||||
override fun getParent(): TestDescriptorInternal?
|
||||
|
||||
fun getId(): Any?
|
||||
|
||||
fun getOwnerBuildOperationId(): Any?
|
||||
|
||||
fun getClassDisplayName(): String?
|
||||
}
|
||||
Reference in New Issue
Block a user