azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change runtime component from "Core" to "Main"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/common/pom.xml
+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>
libraries/stdlib/jre7/pom.xml
+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>
libraries/stdlib/jre8/pom.xml
+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>
libraries/stdlib/pom.xml
+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>
libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
+1 -1
View File
@@ -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>) {
libraries/tools/runtime/pom.xml
+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>