diff --git a/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt b/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt index 03fbae4d93f..95cb601eecb 100644 --- a/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt @@ -33,7 +33,7 @@ import javax.xml.parsers.SAXParserFactory @WithMutedInDatabaseRunTest class KotlinVersionsTest : KtUsefulTestCase() { fun testVersionsAreConsistent() { - val versionPattern = "(\\d+)\\.(\\d+)(\\.(\\d+)|-SNAPSHOT)?".toRegex() + val versionPattern = "(\\d+)\\.(\\d+)(\\.(\\d+))?(?:-(\\p{Alpha}*\\p{Alnum}|[\\p{Alpha}-]*))?(?:-(\\d+))?".toRegex() data class Version(val major: Int, val minor: Int, val patch: Int?, val versionString: String, val source: String) { fun isConsistentWith(other: Version): Boolean { diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml index a166c892a1a..fb514b1230b 100644 --- a/libraries/examples/browser-example-with-library/pom.xml +++ b/libraries/examples/browser-example-with-library/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml index 96a1fcf4a69..8d02c031502 100644 --- a/libraries/examples/browser-example/pom.xml +++ b/libraries/examples/browser-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml index 9db68cc9588..11c46827454 100644 --- a/libraries/examples/js-example/pom.xml +++ b/libraries/examples/js-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml index 86d653f6a1e..679f981ffb9 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.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml index 3e4e8702166..4f56150396f 100644 --- a/libraries/examples/kotlin-js-library-example/pom.xml +++ b/libraries/examples/kotlin-js-library-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/pom.xml b/libraries/pom.xml index edb7f3aeef2..7cc668f1c0a 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT pom Kotlin diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index a3d52ec56ab..51c7c45af45 100755 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml @@ -16,7 +16,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml index 06994776951..c806b06a7c5 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.6.255-SNAPSHOT + 1.7.255-SNAPSHOT pom 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 634689f3688..d906e9174e5 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.6.255-SNAPSHOT \ No newline at end of file +publishing_version = 1.0-5.3-1.7.255-SNAPSHOT \ 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 e49635dbf5e..faa24a4352d 100755 --- a/libraries/tools/kotlin-maven-allopen/pom.xml +++ b/libraries/tools/kotlin-maven-allopen/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml index 4536999e270..ca424a87106 100755 --- a/libraries/tools/kotlin-maven-lombok/pom.xml +++ b/libraries/tools/kotlin-maven-lombok/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml index 69215ffb056..c188fe79c3e 100755 --- a/libraries/tools/kotlin-maven-noarg/pom.xml +++ b/libraries/tools/kotlin-maven-noarg/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.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 50ccd2a5ad3..fcad989c906 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.6.255-SNAPSHOT + 1.7.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 6505f75bbfc..c739befa0b9 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.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 502dc0c927f..a75bddaf177 100755 --- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml +++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index e5625972118..865a5f67f4d 100755 --- a/libraries/tools/kotlin-maven-serialization/pom.xml +++ b/libraries/tools/kotlin-maven-serialization/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-osgi-bundle/pom.xml b/libraries/tools/kotlin-osgi-bundle/pom.xml index 226d51df49e..0f8146bffcf 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.6.255-SNAPSHOT + 1.7.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 5789d13564f..a19587078bf 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.6.255-SNAPSHOT" +final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.7.255-SNAPSHOT" final String repo = isTeamcityBuild ? project.property("kotlinLibsRepo") : "$kotlinRootDir/build/repo" println("# Extracting info:") 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 6739ea7b724..cb7eadf6dbb 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.6.255-SNAPSHOT", + "buildPluginVersion": "1.7.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.6.255-SNAPSHOT", metadata.buildPluginVersion) + assertEquals("1.7.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.6.255-SNAPSHOT", + "buildPluginVersion": "1.7.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.6.255-SNAPSHOT", metadata.buildPluginVersion) + assertEquals("1.7.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 a1bcf1d9ce8..49da469348c 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.6.255-SNAPSHOT + 1.7.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 222add9225a..507614615b5 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.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/pom.xml b/libraries/tools/maven-archetypes/pom.xml index 360ea3fcf6b..19dede12d44 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.6.255-SNAPSHOT + 1.7.255-SNAPSHOT ../../pom.xml diff --git a/tests/mute-common.csv b/tests/mute-common.csv index 95a488173f8..a274dffc66b 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -43,7 +43,6 @@ org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.AnonymousC org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.Issues.testKt_807,,, org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName, Stable failure during run may work in debug,, org.jetbrains.kotlin.shortenRefs.ShortenRefsTestGenerated.testExtensionForObject2, Always red,, -org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567,, org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLambdas, redesign test AsyncStackTraces,, org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.ConvertToAnonymousObject.testHasConcreateMember2, Unprocessed,, org.jetbrains.uast.test.kotlin.KotlinUastTypesTest.testEa101715, Unprocessed,,