diff --git a/build.xml b/build.xml index bf02e882b70..11d8edcbe41 100644 --- a/build.xml +++ b/build.xml @@ -864,7 +864,6 @@ - @@ -876,8 +875,6 @@ - - diff --git a/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt b/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt index 28d0af5b486..9891b7fd72a 100644 --- a/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt @@ -66,12 +66,6 @@ class KotlinVersionsTest : KtUsefulTestCase() { .toVersion("KotlinVersion.CURRENT") ) - versions.add( - Properties().apply { load(File("resources/kotlinManifest.properties").inputStream()) } - .getProperty("manifest.impl.value.kotlin.version")?.toVersion("kotlinManifest.properties") - ?: error("No Kotlin-Version value in kotlinManifest.properties") - ) - versions.add( loadValueFromPomXml("libraries/pom.xml", listOf("project", "version")) ?.toVersion("version in pom.xml") diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties index f4f1558b453..cac306d798b 100644 --- a/resources/kotlinManifest.properties +++ b/resources/kotlinManifest.properties @@ -1,38 +1,25 @@ manifest.impl.vendor=JetBrains manifest.impl.attribute.kotlin.version=Kotlin-Version -manifest.impl.value.kotlin.version=1.1 manifest.impl.attribute.kotlin.runtime.component=Kotlin-Runtime-Component # suppress inspection "UnusedProperty" (Used reflectively in JvmRuntimeVersionsConsistencyChecker) manifest.impl.value.kotlin.runtime.component.core=Core manifest.impl.value.kotlin.runtime.component.main=Main manifest.impl.title.kotlin.compiler=Kotlin Compiler -manifest.impl.title.kotlin.compiler.javadoc=Kotlin Compiler Javadoc manifest.impl.title.kotlin.compiler.sources=Kotlin Compiler Sources manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks -manifest.impl.title.kotlin.jvm.runtime=Kotlin Standard Library -manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect -manifest.impl.title.kotlin.script.runtime=Kotlin Script Runtime -manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources -manifest.impl.title.kotlin.jvm.reflect.sources=Kotlin Reflect Sources -manifest.impl.title.kotlin.script.runtime.sources=Kotlin Script Runtime Sources - manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib manifest.impl.title.kotlin.preloader=Kotlin Preloader manifest.impl.title.kotlin.runner=Kotlin Runner -manifest.impl.title.kotlin.test=Kotlin Testing library manifest.impl.title.kotlin.daemon.client=Kotlin Compile Daemon Client -manifest.impl.title.kotlin.daemon.client.sources=Kotlin Compile Daemon Client Sources manifest.impl.title.kotlin.build.common=Kotlin Build Common -manifest.impl.title.kotlin.build.common.sources=Kotlin Build Common Sources manifest.impl.title.kotlin.compiler.client.embeddable=Kotlin Compiler Client Embeddable -manifest.impl.title.kotlin.compiler.client.embeddable.sources=Kotlin Compiler Client Embeddable Sources