Update SNAPSHOT version in maven projects/tests
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Kotlin</name>
|
<name>Kotlin</name>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-bom</artifactId>
|
<artifactId>kotlin-bom</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<!-- No parent to avoid accidentally inheriting parent's dependencyManagement section -->
|
<!-- No parent to avoid accidentally inheriting parent's dependencyManagement section -->
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ final String kotlinRootDir = rootProject.file("../../../").absolutePath
|
|||||||
final String kotlinLibsDir = "$buildDir/libs"
|
final String kotlinLibsDir = "$buildDir/libs"
|
||||||
|
|
||||||
final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master"
|
final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master"
|
||||||
final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.5.255-SNAPSHOT"
|
final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.6.255-SNAPSHOT"
|
||||||
final String repo = isTeamcityBuild ? project.property("kotlinLibsRepo") : "$kotlinRootDir/build/repo"
|
final String repo = isTeamcityBuild ? project.property("kotlinLibsRepo") : "$kotlinRootDir/build/repo"
|
||||||
|
|
||||||
println("# Extracting info:")
|
println("# Extracting info:")
|
||||||
|
|||||||
+2
-2
@@ -28,7 +28,7 @@ class DeserializeStringTest {
|
|||||||
"buildSystem": "Gradle",
|
"buildSystem": "Gradle",
|
||||||
"buildSystemVersion": "6.7",
|
"buildSystemVersion": "6.7",
|
||||||
"buildPlugin": "org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper",
|
"buildPlugin": "org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper",
|
||||||
"buildPluginVersion": "1.5.255-SNAPSHOT",
|
"buildPluginVersion": "1.6.255-SNAPSHOT",
|
||||||
"projectSettings": {
|
"projectSettings": {
|
||||||
"isHmppEnabled": false,
|
"isHmppEnabled": false,
|
||||||
"isCompatibilityMetadataVariantEnabled": true
|
"isCompatibilityMetadataVariantEnabled": true
|
||||||
@@ -88,7 +88,7 @@ class DeserializeStringTest {
|
|||||||
assertEquals("Gradle", metadata.buildSystem)
|
assertEquals("Gradle", metadata.buildSystem)
|
||||||
assertEquals("6.7", metadata.buildSystemVersion)
|
assertEquals("6.7", metadata.buildSystemVersion)
|
||||||
assertEquals("org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", metadata.buildPlugin)
|
assertEquals("org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", metadata.buildPlugin)
|
||||||
assertEquals("1.5.255-SNAPSHOT", metadata.buildPluginVersion)
|
assertEquals("1.6.255-SNAPSHOT", metadata.buildPluginVersion)
|
||||||
assertFalse(metadata.projectSettings.isHmppEnabled)
|
assertFalse(metadata.projectSettings.isHmppEnabled)
|
||||||
assertTrue(metadata.projectSettings.isCompatibilityMetadataVariantEnabled)
|
assertTrue(metadata.projectSettings.isCompatibilityMetadataVariantEnabled)
|
||||||
assertEquals(5, metadata.projectTargets.size, "Expected exactly 4 targets")
|
assertEquals(5, metadata.projectTargets.size, "Expected exactly 4 targets")
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-archetypes-parent</artifactId>
|
<artifactId>kotlin-archetypes-parent</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-archetypes-parent</artifactId>
|
<artifactId>kotlin-archetypes-parent</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-project</artifactId>
|
<artifactId>kotlin-project</artifactId>
|
||||||
<version>1.5.255-SNAPSHOT</version>
|
<version>1.6.255-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user