Change runtime component from "Core" to "Main"

This is needed to allow the old compiler have the new runtime libraries in the
classpath. See the previous commit for a more elaborate explanation
This commit is contained in:
Alexander Udalov
2017-01-20 20:42:01 +03:00
parent 139d37cfd0
commit fc637eb420
8 changed files with 10 additions and 9 deletions
+3 -3
View File
@@ -461,7 +461,7 @@
<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="${manifest.impl.value.kotlin.runtime.component.core}"/>
<attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.main}"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.javascript.stdlib}"/>
@@ -479,7 +479,7 @@
<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="${manifest.impl.value.kotlin.runtime.component.core}"/>
<attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.main}"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.jvm.runtime.sources}"/>
@@ -1119,7 +1119,7 @@
<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.core}"/>
<attribute name="runtime-component" default="${manifest.impl.value.kotlin.runtime.component.main}"/>
<element name="jar-content"/>
<sequential>
+1 -1
View File
@@ -115,7 +115,7 @@
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
+1 -1
View File
@@ -85,7 +85,7 @@
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
+1 -1
View File
@@ -86,7 +86,7 @@
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
+1 -1
View File
@@ -76,7 +76,7 @@
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
@@ -17,7 +17,7 @@ val LIBRARIES = listOf(
const val KOTLIN_VERSION = "Kotlin-Version"
const val KOTLIN_RUNTIME_COMPONENT = "Kotlin-Runtime-Component"
const val KOTLIN_RUNTIME_COMPONENT_VALUE = "Core"
const val KOTLIN_RUNTIME_COMPONENT_VALUE = "Main"
val KOTLIN_VERSION_VALUE = with(KotlinVersion.CURRENT) { "$major.$minor" }
fun main(args: Array<String>) {
+1 -1
View File
@@ -114,7 +114,7 @@
<archive>
<manifestEntries>
<Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
<Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
<Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
</manifestEntries>
</archive>
</configuration>
+1
View File
@@ -3,6 +3,7 @@ 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