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

[CHERRY PICKED FROM IJ] Use KotlinIdeForTestCompileRuntime instead of ForTestCompileRuntime

Browse Source 
GitOrigin-RevId: adc692b40320957c94fd3f619cb764e4ca108419
Original commit: https://github.com/JetBrains/intellij-community/commit/f4114cf684219e95f3e33341c2a2736a94098ed6
This commit is contained in:
Nikita Bobko
2020-04-22 22:23:06 +03:00
parent 19458f6eb3
commit e24deb8b8a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.model.library.sdk.JpsSdk
import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.jps.util.JpsPathUtil
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.codegen.forTestCompile.KotlinIdeForTestCompileRuntime
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
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.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.codegen.forTestCompile.KotlinIdeForTestCompileRuntime
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.incremental.components.LookupInfo import org.jetbrains.kotlin.incremental.components.LookupInfo
@@ -84,7 +84,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, KotlinIdeForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() },
friendDirs = emptyList() 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.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.codegen.forTestCompile.KotlinIdeForTestCompileRuntime
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) {
MockRuntime( MockRuntime(
"kotlin-mock-runtime", "kotlin-mock-runtime",
ForTestCompileRuntime.minimalRuntimeJarForTests() KotlinIdeForTestCompileRuntime.minimalRuntimeJarForTests()
), ),
JvmStdLib( JvmStdLib(