Remove or replace deprecated kotlin-runtime artifact usages

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt

@@ -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(),

compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml

@@ -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"/>

compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt

@@ -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 {

core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt

@@ -42,7 +42,7 @@ class BuiltInsInitializer<out T : KotlinBuiltIns>(
             }
             catch (e: Throwable) {
                 initializationFailed = e
-                throw IllegalStateException("Built-in library initialization failed. " + "Please ensure you have kotlin-runtime.jar in the classpath: " + e, e)
+                throw IllegalStateException("Built-in library initialization failed. " + "Please ensure you have kotlin-stdlib.jar in the classpath: " + e, e)
             }
             finally {
                 initializing = false

idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java

@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
 
 public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
     private static final String VERSIONS_LIST_URL =
-            "http://search.maven.org/solrsearch/select?q=g:%22org.jetbrains.kotlin%22+AND+a:%22kotlin-runtime%22&core=gav&rows=20&wt=json";
+            "http://search.maven.org/solrsearch/select?q=g:%22org.jetbrains.kotlin%22+AND+a:%22kotlin-stdlib%22&core=gav&rows=20&wt=json";
 
     @NotNull private final String minimumVersion;
 

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt

@@ -119,7 +119,8 @@ fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: () -> Unit) {
     }
 }
 
-private val VirtualFile.isStdLibFile: Boolean get() = presentableUrl.contains("kotlin-runtime.jar")
+// looks like the entire uninvalidation is a dead code now
+private val VirtualFile.isStdLibFile: Boolean get() = false // presentableUrl.contains("kotlin-runtime.jar")
 
 fun invalidateLibraryCache(project: Project) {
     LibraryModificationTracker.getInstance(project).incModificationCount()

idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java

@@ -114,8 +114,8 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest {
 
         // Move fake runtime jar to default library path to pretend library is already configured
         FileUtil.copy(
-                new File(getProject().getBasePath() + "/lib/kotlin-runtime.jar"),
+                new File(getProject().getBasePath() + "/lib/kotlin-stdlib.jar"),
-                new File(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-runtime.jar"));
+                new File(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-stdlib.jar"));
 
         Companion.assertNotConfigured(module, Companion.getJAVA_CONFIGURATOR());
         Companion.getJAVA_CONFIGURATOR().configure(myProject, Collections.<Module>emptyList());

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 task exit << {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt19179/api/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/manyClasses/build.gradle

@@ -16,5 +16,5 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

libraries/tools/kotlin-maven-plugin-test/pom.xml

@@ -124,7 +124,6 @@
                                 <artifact>org.jetbrains.kotlin:kotlin-maven-noarg:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-maven-sam-with-receiver:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-annotation-processing-maven:${project.version}</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-runtime:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-script-runtime:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-common:${project.version}</artifact>

libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml

@@ -19,11 +19,6 @@
             <artifactId>kotlin-reflect</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>

libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt

@@ -21,7 +21,6 @@ import java.util.jar.Attributes
 import java.util.jar.Manifest
 
 val LIBRARIES = listOf(
-        "kotlin-runtime",
         "kotlin-stdlib",
         "kotlin-stdlib-common",
         "kotlin-stdlib-jre7",