Re-enable the cross-tests

.github/workflows/build-rd-kt-container.yml

@@ -12,7 +12,6 @@ jobs:
     container: adoptopenjdk/openjdk11:x86_64-ubuntu-jdk-11.0.11_9
     env:
       GRADLE_USER_HOME: ${{ github.workspace }}/.github/gradle
-      TEAMCITY_VERSION: 1 # temporary; to disable cross tests
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@v2

.github/workflows/build-rd-kt.yml

@@ -14,7 +14,6 @@ jobs:
         os: [macos-10.15, windows-2019]
     env:
       GRADLE_USER_HOME: ${{ github.workspace }}/.github/gradle
-      TEAMCITY_VERSION: 1 # temporary; to disable cross tests
     timeout-minutes: 25
     steps:
     - uses: actions/checkout@v2

.run/rd-cross debug.run.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="rd-cross debug" type="Remote">
+    <module name="rd.rd-cross.main" />
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="true" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="localhost" />
+    <option name="PORT" value="5005" />
+    <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -3,6 +3,5 @@ FROM adoptopenjdk/openjdk11:x86_64-ubuntu-jdk-11.0.11_9
 WORKDIR /rd
 COPY . .
 
-ENV TEAMCITY_VERSION=1
 RUN ./gradlew assemble
 ENTRYPOINT ./gradlew build

README.md

@@ -113,8 +113,6 @@ To build packages locally please use: `rd-kt/rd-gen/pack.sh`
 
 ### On a local computer
 
-Don't forget to set `TEAMCITY_VERSION=1` (temporary measure for now) before running any tests.
-
 ```console
 $ ./gradlew build
 ```

buildSrc/src/main/kotlin/com/jetbrains/rd/gradle/dependencies/Dependencies.kt

@@ -7,4 +7,4 @@ const val junitVersion = "5.6.0"
 const val sl4jVersion = "1.7.12"
 const val nodeVersion = "1.3.1"
 
-const val netCoreAppVersion = "2.1"
+const val netCoreAppVersion = "3.1"

buildSrc/src/main/kotlin/com/jetbrains/rd/gradle/plugins/CrossTestPlugin.kt

@@ -2,11 +2,14 @@
 
 package com.jetbrains.rd.gradle.plugins
 
-import com.jetbrains.rd.gradle.tasks.*
+import com.jetbrains.rd.gradle.tasks.CrossTestCsTask
+import com.jetbrains.rd.gradle.tasks.CrossTestTaskKt
+import com.jetbrains.rd.gradle.tasks.InteropTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.*
+import java.io.File
 
 fun Project.applyCrossTest() = apply<CrossTestPlugin>()
 
@@ -48,6 +51,10 @@ class CrossTestPlugin : Plugin<Project> {
                 classpath += sourceSets["main"].output
                 classpath += configurations["compileClasspath"]
                 classpath += configurations["runtimeClasspath"]
+                classpath = classpath.minus(files(gradle.gradleHomeDir?.resolve("lib")?.listFiles()?.filter { it.name.contains("kotlin-stdlib") || it.name.contains("kotlin-reflect") } ?: listOf<File>()))
+
+                val extraArguments = project.extra["crossTestsJavaAdditionalArgs"]?.toString().orEmpty().split(' ')
+                jvmArgs(extraArguments)
             }
 
             fun creatingCrossTestRdTask() =

buildSrc/src/main/kotlin/com/jetbrains/rd/gradle/tasks/CrossTestTaskKt.kt

@@ -1,15 +1,18 @@
 package com.jetbrains.rd.gradle.tasks
 
-import java.io.IOException
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-
 /**
  * Provides command line arguments for running Kotlin crosstest part
  */
 open class CrossTestTaskKt : KotlinExec(), MarkedExecTask {
     override val commandLineWithArgs: List<String>
-        get() = (super.getCommandLine() + tmpFile.absolutePath)
+        get() {
+            val action = execActionFactory.newJavaExecAction()
+            copyTo(action)
+            action.main = main
+            action.classpath = classpath
+
+            return action.commandLine + tmpFile.absolutePath
+        }
 
     init {
         main = "com.jetbrains.rd.cross.cases.${name}Kt"

gradle.properties

@@ -1,4 +1,6 @@
 version=2021.3.4
 deployMavenToProduction=false
 deployNuGetToNuGetOrg=false
-deployNuGetToInternal=false
+deployNuGetToInternal=false
+enableCrossTests=true
+crossTestsJavaAdditionalArgs=-agentlib:jdwp=transport=dt_socket,server=n,address=HORIZON:5005,suspend=y

settings.gradle.kts

@@ -19,9 +19,9 @@ project(":rd-text").projectDir = File("rd-kt/rd-text")
 include(":rd-swing")
 project(":rd-swing").projectDir = File("rd-kt/rd-swing")
 
-val TEAMCITY_VERSION = "TEAMCITY_VERSION"
+val enableCrossTests = extra["enableCrossTests"]?.toString().orEmpty().let { it == "1" || it.equals("true", true) }
 
-if (System.getenv(TEAMCITY_VERSION) == null) {
+if (enableCrossTests) {
     include(":rd-net")
     project(":rd-net").projectDir = File("rd-net")