From 16148a30c1aa84f9ee871304d9a2a843da13c926 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sun, 12 Aug 2018 04:33:24 +0300 Subject: [PATCH] Remove or replace deprecated kotlin-runtime artifact usages --- .../kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt | 4 ++-- .../integration/ant/js/outputWithoutDirectory/build.xml | 2 +- .../org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt | 2 +- .../src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt | 2 +- .../framework/ui/ConfigureDialogWithModulesAndVersion.java | 2 +- .../test/org/jetbrains/kotlin/idea/test/testUtils.kt | 3 ++- .../kotlin/idea/configuration/ConfigureKotlinTest.java | 4 ++-- .../resources/testProject/gradleDaemonMemory/build.gradle | 2 +- .../resources/testProject/kapt2/kt19179/api/build.gradle | 2 +- .../src/test/resources/testProject/manyClasses/build.gradle | 2 +- libraries/tools/kotlin-maven-plugin-test/pom.xml | 1 - .../src/it/test-kotlin-version-in-manifest/pom.xml | 5 ----- .../test-kotlin-version-in-manifest/src/main/kotlin/test.kt | 1 - 13 files changed, 13 insertions(+), 19 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index 9314f289cb7..fb465aab937 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/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(), diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml index 5c2eb7b342b..7f34d248015 100644 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml +++ b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml @@ -3,7 +3,7 @@ - + diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt index 5042b54aa48..63763a0e94e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt @@ -174,7 +174,7 @@ class GenericReplTest : KtUsefulTestCase() { internal class TestRepl( - templateClasspath: List = listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-runtime.jar")), + templateClasspath: List = listOf(File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-stdlib.jar")), templateClassName: String = "kotlin.script.templates.standard.ScriptTemplateWithArgs", repeatingMode: ReplRepeatingMode = ReplRepeatingMode.NONE ) : Closeable { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt index 3735d9da188..fe2aeae22fa 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt @@ -42,7 +42,7 @@ class BuiltInsInitializer( } 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 diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java index 1ca42029223..4a36a28ac65 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java +++ b/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; diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt index aceb6a4fba8..343eecc3d7e 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt +++ b/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() diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index 437f29f9e7c..936741b7e97 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java +++ b/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(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-runtime.jar")); + new File(getProject().getBasePath() + "/lib/kotlin-stdlib.jar"), + new File(Companion.getJAVA_CONFIGURATOR().getDefaultPathToJarFile(getProject()) + "/kotlin-stdlib.jar")); Companion.assertNotConfigured(module, Companion.getJAVA_CONFIGURATOR()); Companion.getJAVA_CONFIGURATOR().configure(myProject, Collections.emptyList()); diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle index 18166d4531a..cc58e601548 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/gradleDaemonMemory/build.gradle +++ b/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 << { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt19179/api/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt19179/api/build.gradle index c102d8feb62..ee7434e1b5d 100755 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt19179/api/build.gradle +++ b/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" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/manyClasses/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/manyClasses/build.gradle index 45130da1cf1..d78e0ec9d91 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/manyClasses/build.gradle +++ b/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" } diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 9370ba263e5..6a503b40654 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -124,7 +124,6 @@ org.jetbrains.kotlin:kotlin-maven-noarg:${project.version} org.jetbrains.kotlin:kotlin-maven-sam-with-receiver:${project.version} org.jetbrains.kotlin:kotlin-annotation-processing-maven:${project.version} - org.jetbrains.kotlin:kotlin-runtime:${project.version} org.jetbrains.kotlin:kotlin-script-runtime:${project.version} org.jetbrains.kotlin:kotlin-stdlib:${project.version} org.jetbrains.kotlin:kotlin-stdlib-common:${project.version} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml index 1b67a1f9b81..ccb709aa14d 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml @@ -19,11 +19,6 @@ kotlin-reflect ${kotlin.version} - - org.jetbrains.kotlin - kotlin-runtime - ${kotlin.version} - org.jetbrains.kotlin kotlin-stdlib diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt index 0868e994d1f..f63b9d71244 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt +++ b/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",