Remove or replace deprecated kotlin-runtime artifact usages

This commit is contained in:
Ilya Gorbunov
2018-08-12 04:33:24 +03:00
parent c8becbd335
commit 16148a30c1
13 changed files with 13 additions and 19 deletions
@@ -47,7 +47,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
}
private fun prepareAndroidModule() {
println("Copying kotlin-runtime.jar and kotlin-reflect.jar in android module...")
println("Copying kotlin-stdlib.jar and kotlin-reflect.jar in android module...")
copyKotlinRuntimeJars()
println("Check 'libs' folder in tested android module...")
@@ -60,7 +60,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
private fun copyKotlinRuntimeJars() {
FileUtil.copy(
ForTestCompileRuntime.runtimeJarForTests(),
File(pathManager.libsFolderInAndroidTmpFolder + "/kotlin-runtime.jar")
File(pathManager.libsFolderInAndroidTmpFolder + "/kotlin-stdlib.jar")
)
FileUtil.copy(
ForTestCompileRuntime.reflectJarForTests(),
@@ -3,7 +3,7 @@
<java dir="${temp}" fork="true" classname="org.jetbrains.kotlin.cli.js.K2JSCompiler">
<classpath>
<pathelement location="${kotlin.lib}/kotlin-compiler.jar"/>
<pathelement location="${kotlin.lib}/kotlin-runtime.jar"/>
<pathelement location="${kotlin.lib}/kotlin-stdlib.jar"/>
</classpath>
<arg value="${test.data}/root1/foo.kt"/>
<arg value="-output"/>
@@ -174,7 +174,7 @@ class GenericReplTest : KtUsefulTestCase() {
internal class TestRepl(
templateClasspath: List<File> = listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-runtime.jar")),
templateClasspath: List<File> = listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-stdlib.jar")),
templateClassName: String = "kotlin.script.templates.standard.ScriptTemplateWithArgs",
repeatingMode: ReplRepeatingMode = ReplRepeatingMode.NONE
) : Closeable {