Skip to content

Commit 96c36fb

Browse files
committed
Remove manifest.impl.value.kotlin.version and other unused properties from kotlinManifest.properties
1 parent 720e6ec commit 96c36fb

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

build.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,6 @@
864864
<attribute name="jar-dir" default="${kotlin-home}/lib"/>
865865
<attribute name="jar-name"/>
866866
<attribute name="implementation-title"/>
867-
<attribute name="runtime-component" default="${manifest.impl.value.kotlin.runtime.component.main}"/>
868867
<element name="jar-content"/>
869868

870869
<sequential>
@@ -876,8 +875,6 @@
876875

877876
<manifest>
878877
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
879-
<attribute name="${manifest.impl.attribute.kotlin.version}" value="${manifest.impl.value.kotlin.version}"/>
880-
<attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="@{runtime-component}"/>
881878

882879
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
883880
<attribute name="Implementation-Title" value="@{implementation-title}"/>

compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ class KotlinVersionsTest : KtUsefulTestCase() {
6666
.toVersion("KotlinVersion.CURRENT")
6767
)
6868

69-
versions.add(
70-
Properties().apply { load(File("resources/kotlinManifest.properties").inputStream()) }
71-
.getProperty("manifest.impl.value.kotlin.version")?.toVersion("kotlinManifest.properties")
72-
?: error("No Kotlin-Version value in kotlinManifest.properties")
73-
)
74-
7569
versions.add(
7670
loadValueFromPomXml("libraries/pom.xml", listOf("project", "version"))
7771
?.toVersion("version in pom.xml")

resources/kotlinManifest.properties

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
11
manifest.impl.vendor=JetBrains
22

33
manifest.impl.attribute.kotlin.version=Kotlin-Version
4-
manifest.impl.value.kotlin.version=1.1
54
manifest.impl.attribute.kotlin.runtime.component=Kotlin-Runtime-Component
65
# suppress inspection "UnusedProperty" (Used reflectively in JvmRuntimeVersionsConsistencyChecker)
76
manifest.impl.value.kotlin.runtime.component.core=Core
87
manifest.impl.value.kotlin.runtime.component.main=Main
98

109
manifest.impl.title.kotlin.compiler=Kotlin Compiler
11-
manifest.impl.title.kotlin.compiler.javadoc=Kotlin Compiler Javadoc
1210
manifest.impl.title.kotlin.compiler.sources=Kotlin Compiler Sources
1311

1412
manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
1513

16-
manifest.impl.title.kotlin.jvm.runtime=Kotlin Standard Library
17-
manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect
18-
manifest.impl.title.kotlin.script.runtime=Kotlin Script Runtime
19-
manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources
20-
manifest.impl.title.kotlin.jvm.reflect.sources=Kotlin Reflect Sources
21-
manifest.impl.title.kotlin.script.runtime.sources=Kotlin Script Runtime Sources
22-
2314
manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib
2415

2516
manifest.impl.title.kotlin.preloader=Kotlin Preloader
2617

2718
manifest.impl.title.kotlin.runner=Kotlin Runner
2819

29-
manifest.impl.title.kotlin.test=Kotlin Testing library
3020

3121
manifest.impl.title.kotlin.daemon.client=Kotlin Compile Daemon Client
32-
manifest.impl.title.kotlin.daemon.client.sources=Kotlin Compile Daemon Client Sources
3322

3423
manifest.impl.title.kotlin.build.common=Kotlin Build Common
35-
manifest.impl.title.kotlin.build.common.sources=Kotlin Build Common Sources
3624

3725
manifest.impl.title.kotlin.compiler.client.embeddable=Kotlin Compiler Client Embeddable
38-
manifest.impl.title.kotlin.compiler.client.embeddable.sources=Kotlin Compiler Client Embeddable Sources

0 commit comments

Comments
 (0)