kotlin.language.version property no longer used in maven build
This commit is contained in:
@@ -72,12 +72,6 @@ class KotlinVersionsTest : KtUsefulTestCase() {
|
|||||||
?: error("No Kotlin-Version value in kotlinManifest.properties")
|
?: error("No Kotlin-Version value in kotlinManifest.properties")
|
||||||
)
|
)
|
||||||
|
|
||||||
versions.add(
|
|
||||||
loadValueFromPomXml("libraries/pom.xml", listOf("project", "properties", "kotlin.language.version"))
|
|
||||||
?.toVersion("kotlin.language.version in pom.xml")
|
|
||||||
?: error("No kotlin.language.version in libraries/pom.xml")
|
|
||||||
)
|
|
||||||
|
|
||||||
versions.add(
|
versions.add(
|
||||||
loadValueFromPomXml("libraries/pom.xml", listOf("project", "version"))
|
loadValueFromPomXml("libraries/pom.xml", listOf("project", "version"))
|
||||||
?.toVersion("version in pom.xml")
|
?.toVersion("version in pom.xml")
|
||||||
|
|||||||
@@ -53,8 +53,6 @@
|
|||||||
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
|
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
|
||||||
<kotlin.compiler.jdkHome>${env.JDK_18}</kotlin.compiler.jdkHome>
|
<kotlin.compiler.jdkHome>${env.JDK_18}</kotlin.compiler.jdkHome>
|
||||||
|
|
||||||
<kotlin.language.version>1.1</kotlin.language.version>
|
|
||||||
|
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
+17
-1
@@ -1,3 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2017 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
package test
|
package test
|
||||||
|
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
@@ -55,7 +71,7 @@ fun main(args: Array<String>) {
|
|||||||
val incorrectVersionValues = versionValues.filterValues { it != KOTLIN_VERSION_VALUE }
|
val incorrectVersionValues = versionValues.filterValues { it != KOTLIN_VERSION_VALUE }
|
||||||
if (incorrectVersionValues.isNotEmpty()) {
|
if (incorrectVersionValues.isNotEmpty()) {
|
||||||
errors.appendln("Manifests at these locations do not have the correct value of the $KOTLIN_VERSION attribute ($KOTLIN_VERSION_VALUE). " +
|
errors.appendln("Manifests at these locations do not have the correct value of the $KOTLIN_VERSION attribute ($KOTLIN_VERSION_VALUE). " +
|
||||||
"Please ensure that kotlin.language.version in libraries/pom.xml corresponds to the value in kotlin.KotlinVersion:")
|
"Please ensure that kotlin_language_version in libraries/build.gradle corresponds to the value in kotlin.KotlinVersion:")
|
||||||
incorrectVersionValues.entries.joinTo(errors, "\n", transform = ::renderEntry)
|
incorrectVersionValues.entries.joinTo(errors, "\n", transform = ::renderEntry)
|
||||||
errors.appendln()
|
errors.appendln()
|
||||||
errors.appendln()
|
errors.appendln()
|
||||||
|
|||||||
Reference in New Issue
Block a user