Skip to content

Commit 720e6ec

Browse files
committed
kotlin.language.version property no longer used in maven build
1 parent 3bfc17c commit 720e6ec

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ class KotlinVersionsTest : KtUsefulTestCase() {
7272
?: error("No Kotlin-Version value in kotlinManifest.properties")
7373
)
7474

75-
versions.add(
76-
loadValueFromPomXml("libraries/pom.xml", listOf("project", "properties", "kotlin.language.version"))
77-
?.toVersion("kotlin.language.version in pom.xml")
78-
?: error("No kotlin.language.version in libraries/pom.xml")
79-
)
80-
8175
versions.add(
8276
loadValueFromPomXml("libraries/pom.xml", listOf("project", "version"))
8377
?.toVersion("version in pom.xml")

libraries/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
5454
<kotlin.compiler.jdkHome>${env.JDK_18}</kotlin.compiler.jdkHome>
5555

56-
<kotlin.language.version>1.1</kotlin.language.version>
57-
5856
<maven.compiler.source>1.6</maven.compiler.source>
5957
<maven.compiler.target>1.6</maven.compiler.target>
6058
</properties>

libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2010-2017 JetBrains s.r.o.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package test
218

319
import java.net.URL
@@ -55,7 +71,7 @@ fun main(args: Array<String>) {
5571
val incorrectVersionValues = versionValues.filterValues { it != KOTLIN_VERSION_VALUE }
5672
if (incorrectVersionValues.isNotEmpty()) {
5773
errors.appendln("Manifests at these locations do not have the correct value of the $KOTLIN_VERSION attribute ($KOTLIN_VERSION_VALUE). " +
58-
"Please ensure that kotlin.language.version in libraries/pom.xml corresponds to the value in kotlin.KotlinVersion:")
74+
"Please ensure that kotlin_language_version in libraries/build.gradle corresponds to the value in kotlin.KotlinVersion:")
5975
incorrectVersionValues.entries.joinTo(errors, "\n", transform = ::renderEntry)
6076
errors.appendln()
6177
errors.appendln()

0 commit comments

Comments
 (0)