From 4ef18fe036033000cd6383bddc1a65f5530e0246 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 12 Jun 2020 21:11:31 +0900
Subject: [PATCH] [CHERRY PICKED FROM IJ] Remove almost all dependencies to
 dist/ artifacts

'kotlin-coroutines-experimental-compat' is to migrate.

GitOrigin-RevId: 94dd58c1b38e763403b1f4252853b52d3a9d2f98
Original commit: https://github.com/JetBrains/intellij-community/commit/5b3fa35e82fe3e686328ae62d83de99e7be46dc6
---
 .../jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt  | 3 ++-
 .../test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
index 714c2f7a54b..e147fc4b4f0 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.compilerRunner.*
 import org.jetbrains.kotlin.config.Services
+import org.jetbrains.kotlin.idea.artifacts.TestKotlinArtifacts
 import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.Position
@@ -84,7 +85,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
             sourcesToCompile = filesToCompile.toList(),
             commonSources = emptyList(),
             javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)),
-            classpath = listOf(outDir, ForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() },
+            classpath = listOf(outDir, TestKotlinArtifacts.kotlinStdlib).filter { it.exists() },
             friendDirs = emptyList()
         )
 
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
index aa227ea0cef..270d8afe5f8 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
@@ -9,14 +9,15 @@ import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.java.JpsJavaLibraryType
 import org.jetbrains.jps.model.library.JpsLibrary
 import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 
 enum class KotlinJpsLibrary(val id: String, vararg val roots: File) {
+    @Deprecated("Use JvmStdlib instead")
     MockRuntime(
         "kotlin-mock-runtime",
-        ForTestCompileRuntime.minimalRuntimeJarForTests()
+        PathUtil.kotlinPathsForDistDirectory.stdlibPath,
+        File(PathUtil.kotlinPathsForDistDirectory.libPath, "annotations-13.0.jar")
     ),
 
     JvmStdLib(