azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHERRY PICKED FROM IJ] Remove almost all dependencies to dist/ artifacts

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

GitOrigin-RevId: 94dd58c1b38e763403b1f4252853b52d3a9d2f98
Original commit: https://github.com/JetBrains/intellij-community/commit/5b3fa35e82fe3e686328ae62d83de99e7be46dc6
This commit is contained in:
Yan Zhulanow
2020-06-12 21:11:31 +09:00
committed by Nikita Bobko
parent 3acd977a36
commit 4ef18fe036
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.config.Services 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.LookupInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position import org.jetbrains.kotlin.incremental.components.Position
@@ -84,7 +85,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
sourcesToCompile = filesToCompile.toList(), sourcesToCompile = filesToCompile.toList(),
commonSources = emptyList(), commonSources = emptyList(),
javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)), javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)),
classpath = listOf(outDir, ForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() }, classpath = listOf(outDir, TestKotlinArtifacts.kotlinStdlib).filter { it.exists() },
friendDirs = emptyList() friendDirs = emptyList()
) )
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
+3 -2
View File
@@ -9,14 +9,15 @@ import org.jetbrains.jps.model.JpsProject
import org.jetbrains.jps.model.java.JpsJavaLibraryType import org.jetbrains.jps.model.java.JpsJavaLibraryType
import org.jetbrains.jps.model.library.JpsLibrary import org.jetbrains.jps.model.library.JpsLibrary
import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
enum class KotlinJpsLibrary(val id: String, vararg val roots: File) { enum class KotlinJpsLibrary(val id: String, vararg val roots: File) {
@Deprecated("Use JvmStdlib instead")
MockRuntime( MockRuntime(
"kotlin-mock-runtime", "kotlin-mock-runtime",
ForTestCompileRuntime.minimalRuntimeJarForTests() PathUtil.kotlinPathsForDistDirectory.stdlibPath,
File(PathUtil.kotlinPathsForDistDirectory.libPath, "annotations-13.0.jar")
), ),
JvmStdLib( JvmStdLib(