From 66544a4e0055cc151e6b736a280e780c9ee0da42 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 21 Nov 2022 18:01:37 +0200 Subject: [PATCH] Switch kotlin version to 1.9 with appropriate fixes in testdata, tests and other places. --- .../main/kotlin/checkExpectedGradlePropertyValues.kt | 2 +- .../src/org/jetbrains/kotlin/utils/metadataHelpers.kt | 4 ++-- .../jetbrains/kotlin/config/LanguageVersionSettings.kt | 10 +++++----- .../metadata/jvm/deserialization/JvmMetadataVersion.kt | 2 +- gradle.properties | 2 +- libraries/examples/kotlin-java-example/pom.xml | 2 +- libraries/pom.xml | 2 +- libraries/stdlib/src/kotlin/util/KotlinVersion.kt | 4 ++-- .../tools/kotlin-annotation-processing-maven/pom.xml | 2 +- libraries/tools/kotlin-bom/pom.xml | 2 +- libraries/tools/kotlin-dist-for-jps-meta/pom.xml | 2 +- .../org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt | 4 ++-- .../kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt | 4 ++-- .../jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt | 4 ++-- .../hierarchical-mpp-multi-modules/gradle.properties | 2 +- .../src/test/kotlin/MetricPolicyTest.kt | 6 +++--- libraries/tools/kotlin-maven-allopen/pom.xml | 2 +- libraries/tools/kotlin-maven-lombok/pom.xml | 2 +- libraries/tools/kotlin-maven-noarg/pom.xml | 2 +- libraries/tools/kotlin-maven-plugin-test/pom.xml | 2 +- libraries/tools/kotlin-maven-plugin/pom.xml | 2 +- libraries/tools/kotlin-maven-sam-with-receiver/pom.xml | 2 +- libraries/tools/kotlin-maven-serialization/pom.xml | 2 +- libraries/tools/kotlin-osgi-bundle/pom.xml | 2 +- .../tools/kotlin-stdlib-docs/kotlin_big/build.gradle | 4 ++-- .../jetbrains/kotlin/tooling/DeserializeStringTest.kt | 8 ++++---- .../tools/maven-archetypes/kotlin-archetype-js/pom.xml | 2 +- .../maven-archetypes/kotlin-archetype-jvm/pom.xml | 2 +- libraries/tools/maven-archetypes/pom.xml | 2 +- 29 files changed, 44 insertions(+), 44 deletions(-) diff --git a/buildSrc/src/main/kotlin/checkExpectedGradlePropertyValues.kt b/buildSrc/src/main/kotlin/checkExpectedGradlePropertyValues.kt index 0f1ae687125..eba1160da7d 100644 --- a/buildSrc/src/main/kotlin/checkExpectedGradlePropertyValues.kt +++ b/buildSrc/src/main/kotlin/checkExpectedGradlePropertyValues.kt @@ -18,7 +18,7 @@ import org.gradle.api.Project * * e.g. if a developer set's * - * `defaultSnapshotVersion.kotlin_build.expected_value=1.6.255-SNAPSHOT` and the value gets bumped to `1.8.255-SNAPSHOT` after pulling from master, + * `defaultSnapshotVersion.kotlin_build.expected_value=1.6.255-SNAPSHOT` and the value gets bumped to `1.9.255-SNAPSHOT` after pulling from master, * the developer will notice this during project configuration phase. */ fun Project.checkExpectedGradlePropertyValues() { diff --git a/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt index 75fa2795a93..03f7ebbf549 100644 --- a/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt +++ b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt @@ -23,8 +23,8 @@ private val LANGUAGE_TO_METADATA_VERSION = EnumMap= 2) fromVersionString("${it[0]}.${it[1]}") else null } // Version status - // 1.0 1.1 1.2 1.3 1.4 1.5..1.8 1.9 + // 1.0..1.3 1.4..1.5 1.6..1.9 2.0 // Language: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL // API: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL @JvmField - val FIRST_API_SUPPORTED = KOTLIN_1_3 + val FIRST_API_SUPPORTED = KOTLIN_1_4 @JvmField - val FIRST_SUPPORTED = KOTLIN_1_3 + val FIRST_SUPPORTED = KOTLIN_1_4 @JvmField - val FIRST_NON_DEPRECATED = KOTLIN_1_5 + val FIRST_NON_DEPRECATED = KOTLIN_1_6 @JvmField - val LATEST_STABLE = KOTLIN_1_8 + val LATEST_STABLE = KOTLIN_1_9 } } diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt index d05f51e15a6..2e6a946610f 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt @@ -56,7 +56,7 @@ class JvmMetadataVersion(versionArray: IntArray, val isStrictSemantics: Boolean) companion object { @JvmField - val INSTANCE = JvmMetadataVersion(1, 8, 0) + val INSTANCE = JvmMetadataVersion(1, 9, 0) @JvmField val INSTANCE_NEXT = INSTANCE.next() diff --git a/gradle.properties b/gradle.properties index 30b562a1e10..192c96d75fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ systemProp.org.gradle.internal.http.socketTimeout=90000 systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true cacheRedirectorEnabled=true -defaultSnapshotVersion=1.8.255-SNAPSHOT +defaultSnapshotVersion=1.9.255-SNAPSHOT kotlin.build.gradlePlugin.version=0.0.39 diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml index 68cf10873cc..28144c9055d 100644 --- a/libraries/examples/kotlin-java-example/pom.xml +++ b/libraries/examples/kotlin-java-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/pom.xml b/libraries/pom.xml index 28ba5cab2d3..4d9386abc55 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT pom Kotlin diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt index 23ebfdb2125..428373db11f 100644 --- a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt +++ b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt @@ -79,5 +79,5 @@ public class KotlinVersion(val major: Int, val minor: Int, val patch: Int) : Com // this class is ignored during classpath normalization when considering whether to recompile dependencies in Kotlin build private object KotlinVersionCurrentValue { @kotlin.jvm.JvmStatic - fun get(): KotlinVersion = KotlinVersion(1, 8, 255) // value is written here automatically during build -} \ No newline at end of file + fun get(): KotlinVersion = KotlinVersion(1, 9, 255) // value is written here automatically during build +} diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index e8077212a7e..211af749d88 100755 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml @@ -15,7 +15,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml index 214aed380da..4a507178a77 100644 --- a/libraries/tools/kotlin-bom/pom.xml +++ b/libraries/tools/kotlin-bom/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-bom - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT pom diff --git a/libraries/tools/kotlin-dist-for-jps-meta/pom.xml b/libraries/tools/kotlin-dist-for-jps-meta/pom.xml index 6f9ab4fbf5c..043fa21a93f 100644 --- a/libraries/tools/kotlin-dist-for-jps-meta/pom.xml +++ b/libraries/tools/kotlin-dist-for-jps-meta/pom.xml @@ -11,7 +11,7 @@ kotlin-project org.jetbrains.kotlin - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt index c23093ef35d..e1c5e6c1488 100644 --- a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt +++ b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt @@ -9,9 +9,9 @@ enum class KotlinVersion(val version: String) { @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_0("1.0"), @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_1("1.1"), @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_2("1.2"), - @Deprecated("Will be removed soon") KOTLIN_1_3("1.3"), + @Deprecated("Unsupported", level = DeprecationLevel.ERROR) KOTLIN_1_3("1.3"), @Deprecated("Will be removed soon") KOTLIN_1_4("1.4"), - KOTLIN_1_5("1.5"), + @Deprecated("Will be removed soon") KOTLIN_1_5("1.5"), KOTLIN_1_6("1.6"), KOTLIN_1_7("1.7"), KOTLIN_1_8("1.8"), diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt index 973a622a641..691183e7214 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt @@ -9,7 +9,7 @@ interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCo /** * Allow using declarations only from the specified version of bundled libraries - * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)", "2.0 (experimental)" + * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)" * Default value: null */ @get:org.gradle.api.tasks.Optional @@ -18,7 +18,7 @@ interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCo /** * Provide source compatibility with the specified version of Kotlin - * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)", "2.0 (experimental)" + * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)" * Default value: null */ @get:org.gradle.api.tasks.Optional diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index 8d8ac4958e6..e1d9cd3dac9 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -14,7 +14,7 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonTool /** * Allow using declarations only from the specified version of bundled libraries - * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)", "2.0 (experimental)" + * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)" * Default value: null */ var apiVersion: kotlin.String? @@ -27,7 +27,7 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonTool /** * Provide source compatibility with the specified version of Kotlin - * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8", "1.9 (experimental)", "2.0 (experimental)" + * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)" * Default value: null */ var languageVersion: kotlin.String? diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/gradle.properties index 689ba582a24..0ff2f18a9f0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/gradle.properties @@ -1 +1 @@ -publishing_version = 1.0-5.3-1.8.255-SNAPSHOT \ No newline at end of file +publishing_version = 1.0-5.3-1.9.255-SNAPSHOT diff --git a/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/MetricPolicyTest.kt b/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/MetricPolicyTest.kt index 8972768cf43..9e0e2a1c927 100644 --- a/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/MetricPolicyTest.kt +++ b/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/MetricPolicyTest.kt @@ -49,9 +49,9 @@ class MetricPolicyTest { assertEquals("1.2.3", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("1.2.3-unknown suffix")) assertEquals("123.234.345-dev", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("123.234.345-dev-12345")) - assertEquals("1.8.255-snapshot", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("1.8.255-SNAPSHOT")) + assertEquals("1.9.255-snapshot", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("1.9.255-SNAPSHOT")) - assertEquals("1.8.255-beta", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("1.8.255-beta")) + assertEquals("1.9.255-beta", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("1.9.255-beta")) } @Test @@ -71,4 +71,4 @@ class MetricPolicyTest { whenAdded("AAA", "UNEXPECTED-VALUE${separator}common${separator}js${separator}jvm") whenAdded("BBB", "UNEXPECTED-VALUE${separator}common${separator}js${separator}jvm") } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml index dd1b8a699ea..1ee4f274f4c 100755 --- a/libraries/tools/kotlin-maven-allopen/pom.xml +++ b/libraries/tools/kotlin-maven-allopen/pom.xml @@ -16,7 +16,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml index 0e9a018e37a..ff1627e0182 100755 --- a/libraries/tools/kotlin-maven-lombok/pom.xml +++ b/libraries/tools/kotlin-maven-lombok/pom.xml @@ -16,7 +16,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml index e9f2c9892a1..85c43011665 100755 --- a/libraries/tools/kotlin-maven-noarg/pom.xml +++ b/libraries/tools/kotlin-maven-noarg/pom.xml @@ -17,7 +17,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index e642d60ccee..3e6c20c5d75 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -5,7 +5,7 @@ kotlin-project org.jetbrains.kotlin - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index 045c8c20792..d8ee24211aa 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml index 7812f2a2b37..4f8cccb62f8 100755 --- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml +++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml @@ -17,7 +17,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index 1be5522aa56..792d4820f82 100755 --- a/libraries/tools/kotlin-maven-serialization/pom.xml +++ b/libraries/tools/kotlin-maven-serialization/pom.xml @@ -17,7 +17,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-osgi-bundle/pom.xml b/libraries/tools/kotlin-osgi-bundle/pom.xml index 7bac0c015c9..bb05ab530c0 100644 --- a/libraries/tools/kotlin-osgi-bundle/pom.xml +++ b/libraries/tools/kotlin-osgi-bundle/pom.xml @@ -5,7 +5,7 @@ kotlin-project org.jetbrains.kotlin - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle index c57dbce436d..88e2b390fec 100644 --- a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle @@ -7,7 +7,7 @@ final String kotlinRootDir = rootProject.file("../../../").absolutePath.replace( final String kotlinLibsDir = "$buildDir/libs" final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master" -final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.8.255-SNAPSHOT" +final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.9.255-SNAPSHOT" final String repo = isTeamcityBuild ? project.property("kotlinLibsRepo") : "$kotlinRootDir/build/repo" println("# Extracting info:") @@ -95,4 +95,4 @@ project.extensions.uncommentSinceKotlinForNewEnums = { } file.write(String.join("\n", lines)) } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt b/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt index 7837531e75b..0717581b193 100644 --- a/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt +++ b/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt @@ -18,7 +18,7 @@ class DeserializeStringTest { "buildSystem": "Gradle", "buildSystemVersion": "6.7", "buildPlugin": "org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", - "buildPluginVersion": "1.8.255-SNAPSHOT", + "buildPluginVersion": "1.9.255-SNAPSHOT", "projectSettings": { "isHmppEnabled": false, "isCompatibilityMetadataVariantEnabled": true @@ -78,7 +78,7 @@ class DeserializeStringTest { assertEquals("Gradle", metadata.buildSystem) assertEquals("6.7", metadata.buildSystemVersion) assertEquals("org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", metadata.buildPlugin) - assertEquals("1.8.255-SNAPSHOT", metadata.buildPluginVersion) + assertEquals("1.9.255-SNAPSHOT", metadata.buildPluginVersion) assertFalse(metadata.projectSettings.isHmppEnabled) assertTrue(metadata.projectSettings.isCompatibilityMetadataVariantEnabled) assertFalse(metadata.projectSettings.isKPMEnabled) @@ -134,7 +134,7 @@ class DeserializeStringTest { "buildSystem": "Gradle", "buildSystemVersion": "7.1", "buildPlugin": "org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", - "buildPluginVersion": "1.8.255-SNAPSHOT", + "buildPluginVersion": "1.9.255-SNAPSHOT", "projectSettings": { "isHmppEnabled": false, "isCompatibilityMetadataVariantEnabled": true, @@ -191,7 +191,7 @@ class DeserializeStringTest { assertEquals("Gradle", metadata.buildSystem) assertEquals("7.1", metadata.buildSystemVersion) assertEquals("org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper", metadata.buildPlugin) - assertEquals("1.8.255-SNAPSHOT", metadata.buildPluginVersion) + assertEquals("1.9.255-SNAPSHOT", metadata.buildPluginVersion) assertFalse(metadata.projectSettings.isHmppEnabled) assertTrue(metadata.projectSettings.isCompatibilityMetadataVariantEnabled) assertTrue(metadata.projectSettings.isKPMEnabled) diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml index d5ec511b896..7dee5cfa4c4 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-archetypes-parent - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml index 85f08da3f77..d1f9c2d9d30 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-archetypes-parent - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/pom.xml b/libraries/tools/maven-archetypes/pom.xml index a76484ab6c3..8d6f08ac42e 100644 --- a/libraries/tools/maven-archetypes/pom.xml +++ b/libraries/tools/maven-archetypes/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-project - 1.8.255-SNAPSHOT + 1.9.255-SNAPSHOT ../../pom.xml