193: Update to 193.3793.14-EAP-SNAPSHOT

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -65,15 +65,32 @@ dependencies {
     runtime(project(":kotlin-reflect"))
 
     jarContents(compileOnly(intellijDep()) {
-        includeJars("asm-all", "serviceMessages", "gson", rootProject = rootProject)
+        includeJars("asm-all", "gson", rootProject = rootProject)
     })
 
+    jarContents(compileOnly(intellijDep()) {
+        if (Platform.P193.orHigher()) {
+            includeJars("teamcity-service-messages", rootProject = rootProject)
+        } else {
+            includeJars("serviceMessages", rootProject = rootProject)
+        }
+    })
+
+
     // com.android.tools.build:gradle has ~50 unneeded transitive dependencies
     compileOnly("com.android.tools.build:gradle:3.0.0") { isTransitive = false }
     compileOnly("com.android.tools.build:gradle-core:3.0.0") { isTransitive = false }
     compileOnly("com.android.tools.build:builder-model:3.0.0") { isTransitive = false }
 
-    testCompile(intellijDep()) { includeJars("serviceMessages", "junit", rootProject = rootProject) }
+    testCompile(intellijDep()) { includeJars( "junit", rootProject = rootProject) }
+    testCompile(intellijDep()) {
+        if (Platform.P193.orHigher()) {
+            includeJars("teamcity-service-messages", rootProject = rootProject)
+        } else {
+            includeJars("serviceMessages", rootProject = rootProject)
+        }
+    }
+
     testCompileOnly(project(":compiler"))
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(project(":kotlin-android-extensions"))

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt

@@ -508,7 +508,7 @@ internal open class TCServiceMessagesClient(
                     if (currentLeaf is TestNode) {
                         currentTest = currentLeaf
                         output.append(currentLeaf.allOutput)
-                        currentLeaf.failure(TestFailed(currentLeaf.cleanName, null))
+                        currentLeaf.failure(TestFailed(currentLeaf.cleanName, null as Throwable?))
                     }
 
                     close(ts, currentLeaf.localId)