Remove or replace deprecated kotlin-runtime artifact usages
This commit is contained in:
+2
-2
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user