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

[CHERRY PICKED FROM IJ] No more need for KotlinIdeForTestCompileRuntime use ForTestCompileRuntime instead

Browse Source 
`KotlinIdeForTestCompileRuntime` was temp class. We don't need it
anymore because `tests-common` migrated to `kotlin-ide` repo and
`ForTestCompileRuntime` now is under our control

GitOrigin-RevId: f871531fec3aa09ad911d0dc6b9273ab32dbbf23
Original commit: https://github.com/JetBrains/intellij-community/commit/67838fa145c21747d8aa89b728ceb623e27e9676
This commit is contained in:
Nikita Bobko
2020-04-24 01:32:42 +03:00
parent e24deb8b8a
commit 7d938590f9
2 changed files with 4 additions and 4 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 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.forTestCompile.KotlinIdeForTestCompileRuntime
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.incremental.components.LookupInfo
@@ -84,7 +84,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
sourcesToCompile = filesToCompile.toList(),
commonSources = emptyList(),
javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)),
classpath = listOf(outDir, KotlinIdeForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() },
classpath = listOf(outDir, ForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() },
friendDirs = emptyList()
)
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
+2 -2
View File
@@ -9,14 +9,14 @@ 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.KotlinIdeForTestCompileRuntime
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) {
MockRuntime(
"kotlin-mock-runtime",
KotlinIdeForTestCompileRuntime.minimalRuntimeJarForTests()
ForTestCompileRuntime.minimalRuntimeJarForTests()
),
JvmStdLib(