[Gradle, JS] Move TeamCity related classes to internal
#KT-38109 fixed #KT-38286 fixed
This commit is contained in:
+9
-3
@@ -3,7 +3,7 @@
|
||||
* 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.targets.js
|
||||
package org.jetbrains.kotlin.gradle.internal
|
||||
|
||||
import jetbrains.buildServer.messages.serviceMessages.Message
|
||||
import jetbrains.buildServer.messages.serviceMessages.ServiceMessage
|
||||
@@ -22,7 +22,8 @@ class TeamCityMessageCommonClient(
|
||||
|
||||
private val errors = mutableListOf<String>()
|
||||
|
||||
private val stackTraceProcessor = TeamCityMessageStackTraceProcessor()
|
||||
private val stackTraceProcessor =
|
||||
TeamCityMessageStackTraceProcessor()
|
||||
|
||||
override fun parseException(e: ParseException, text: String) {
|
||||
log.error("Failed to parse test process messages: \"$text\"", e)
|
||||
@@ -30,7 +31,12 @@ class TeamCityMessageCommonClient(
|
||||
|
||||
override fun serviceMessage(message: ServiceMessage) {
|
||||
when (message) {
|
||||
is Message -> printMessage(message.text, LogType.byValueOrNull(message.attributes["type"]))
|
||||
is Message -> printMessage(
|
||||
message.text,
|
||||
LogType.byValueOrNull(
|
||||
message.attributes["type"]
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
afterMessage = true
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* 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.targets.js
|
||||
package org.jetbrains.kotlin.gradle.internal
|
||||
|
||||
internal class TeamCityMessageStackTraceProcessor {
|
||||
private var firstLine: String? = null
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* 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.targets.js
|
||||
package org.jetbrains.kotlin.gradle.internal
|
||||
|
||||
import org.jetbrains.kotlin.gradle.utils.clearAnsiColor
|
||||
import org.gradle.api.logging.Logger as GradleLogger
|
||||
-1
@@ -11,7 +11,6 @@ import org.gradle.process.ExecResult
|
||||
import org.gradle.process.internal.ExecAction
|
||||
import org.gradle.process.internal.ExecActionFactory
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandler
|
||||
import org.jetbrains.kotlin.gradle.targets.js.TeamCityMessageCommonClient
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.PipedInputStream
|
||||
import java.io.PipedOutputStream
|
||||
|
||||
+1
-1
@@ -14,8 +14,8 @@ import org.gradle.api.tasks.testing.TestResult
|
||||
import org.gradle.api.tasks.testing.TestResult.ResultType.*
|
||||
import org.gradle.internal.operations.OperationIdentifier
|
||||
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.targets.js.LogType
|
||||
import org.jetbrains.kotlin.gradle.testing.KotlinTestFailure
|
||||
import org.slf4j.Logger
|
||||
import java.text.ParseException
|
||||
|
||||
+1
-1
@@ -7,10 +7,10 @@ package org.jetbrains.kotlin.gradle.targets.js.testing
|
||||
|
||||
import org.gradle.api.internal.tasks.testing.TestResultProcessor
|
||||
import org.gradle.process.ProcessForkOptions
|
||||
import org.jetbrains.kotlin.gradle.internal.LogType
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
|
||||
import org.jetbrains.kotlin.gradle.targets.js.LogType
|
||||
import org.slf4j.Logger
|
||||
|
||||
internal open class JSServiceMessagesTestExecutionSpec(
|
||||
|
||||
+9
-2
@@ -12,13 +12,19 @@ import org.gradle.api.internal.tasks.testing.TestResultProcessor
|
||||
import org.gradle.internal.logging.progress.ProgressLogger
|
||||
import org.gradle.process.ProcessForkOptions
|
||||
import org.gradle.process.internal.ExecHandle
|
||||
import org.jetbrains.kotlin.gradle.internal.LogType
|
||||
import org.jetbrains.kotlin.gradle.internal.TeamCityMessageStackTraceProcessor
|
||||
import org.jetbrains.kotlin.gradle.internal.operation
|
||||
import org.jetbrains.kotlin.gradle.internal.processLogMessage
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
|
||||
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor.Companion.TC_PROJECT_PROPERTY
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
|
||||
import org.jetbrains.kotlin.gradle.targets.js.*
|
||||
import org.jetbrains.kotlin.gradle.targets.js.NpmPackageVersion
|
||||
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
|
||||
import org.jetbrains.kotlin.gradle.targets.js.appendConfigsFromDir
|
||||
import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm
|
||||
import org.jetbrains.kotlin.gradle.targets.js.jsQuoted
|
||||
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
|
||||
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
|
||||
import org.jetbrains.kotlin.gradle.targets.js.testing.*
|
||||
@@ -417,7 +423,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
|
||||
|
||||
private val failedBrowsers: MutableList<String> = mutableListOf()
|
||||
|
||||
private var stackTraceProcessor = TeamCityMessageStackTraceProcessor()
|
||||
private var stackTraceProcessor =
|
||||
TeamCityMessageStackTraceProcessor()
|
||||
|
||||
override fun printNonTestOutput(text: String, type: LogType?) {
|
||||
val value = text.trimEnd()
|
||||
|
||||
Reference in New Issue
Block a user