Fix IDE issues with gateway/rider/ultimate (#3563)

Author: rli

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -18,12 +18,12 @@ sourceSets {
     }
 }
 
-configurations.getByName("integrationTestImplementation") {
-    extendsFrom(configurations.getByName(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME))
+configurations.getByName("integrationTestCompileClasspath") {
+    extendsFrom(configurations.getByName(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME))
     isCanBeResolved = true
 }
-configurations.getByName("integrationTestRuntimeOnly") {
-    extendsFrom(configurations.getByName(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME))
+configurations.getByName("integrationTestRuntimeClasspath") {
+    extendsFrom(configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME))
     isCanBeResolved = true
 }
 

jetbrains-gateway/build.gradle.kts

@@ -21,12 +21,13 @@ val gatewayRunOnly by configurations.creating {
 }
 
 dependencies {
-    // pull in :j-c:instrumentedJar for compile and :intellij:buildPlugin, but gateway variant when runIde/buildPlugin from :jetbrains-gateway
-    compileOnly(project(":jetbrains-core", "instrumentedJar"))
+    // link against :j-c: and rely on :intellij:buildPlugin to pull in :j-c:instrumentedJar, but gateway variant when runIde/buildPlugin from :jetbrains-gateway
+    compileOnly(project(":jetbrains-core"))
     gatewayRunOnly(project(":jetbrains-core", "gatewayArtifacts"))
 
     testImplementation(project(path = ":core", configuration = "testArtifacts"))
-    testImplementation(project(":jetbrains-core", "gatewayArtifacts"))
+    testCompileOnly(project(":jetbrains-core"))
+    testRuntimeOnly(project(":jetbrains-core", "gatewayArtifacts"))
     testImplementation(project(path = ":jetbrains-core", configuration = "testArtifacts"))
     testImplementation(libs.wiremock)
     testImplementation(libs.bundles.sshd)

jetbrains-rider/build.gradle.kts

@@ -50,7 +50,11 @@ sourceSets {
 }
 
 dependencies {
-    implementation(project(":jetbrains-core", "instrumentedJar"))
+    compileOnly(project(":jetbrains-core"))
+    runtimeOnly(project(":jetbrains-core", "instrumentedJar"))
+
+    testCompileOnly(project(":jetbrains-core"))
+    testRuntimeOnly(project(":jetbrains-core", "instrumentedJar"))
     testImplementation(project(path = ":jetbrains-core", configuration = "testArtifacts"))
 }
 

jetbrains-ultimate/build.gradle.kts

@@ -11,13 +11,14 @@ plugins {
 }
 
 dependencies {
-    api(project(":jetbrains-core", "instrumentedJar"))
+    compileOnly(project(":jetbrains-core"))
+    runtimeOnly(project(":jetbrains-core", "instrumentedJar"))
 
+    testCompileOnly(project(":jetbrains-core"))
+    testRuntimeOnly(project(":jetbrains-core", "instrumentedJar"))
     testImplementation(project(path = ":jetbrains-core", configuration = "testArtifacts"))
     testImplementation(project(path = ":core", configuration = "testArtifacts"))
     testImplementation(libs.mockk)
-
-    integrationTestImplementation(project(path = ":jetbrains-core", configuration = "testArtifacts"))
 }
 
 intellijToolkit {