Remove manifest.impl.value.kotlin.version and other unused properties from kotlinManifest.properties

This commit is contained in:
Ilya Gorbunov
2017-04-27 23:08:52 +03:00
parent 720e6ecdb6
commit 96c36fb317
3 changed files with 0 additions and 22 deletions
-3
View File
@@ -864,7 +864,6 @@
<attribute name="jar-dir" default="${kotlin-home}/lib"/>
<attribute name="jar-name"/>
<attribute name="implementation-title"/>
<attribute name="runtime-component" default="${manifest.impl.value.kotlin.runtime.component.main}"/>
<element name="jar-content"/>
<sequential>
@@ -876,8 +875,6 @@
<manifest>
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
<attribute name="${manifest.impl.attribute.kotlin.version}" value="${manifest.impl.value.kotlin.version}"/>
<attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="@{runtime-component}"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Title" value="@{implementation-title}"/>
@@ -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")
-13
View File
@@ -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