azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix versions in poms, etc, unmute and fix appropriate test

Browse Source
This commit is contained in:
Ilya Chernikov
2022-04-19 16:36:51 +02:00
parent 24f3c7dc7d
commit 352fa7540c
24 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/util/KotlinVersionsTest.kt
+1 -1
View File
@@ -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 {
libraries/examples/browser-example-with-library/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/examples/browser-example/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/examples/js-example/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/examples/kotlin-java-example/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/examples/kotlin-js-library-example/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Kotlin</name>
libraries/tools/kotlin-annotation-processing-maven/pom.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-bom/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-bom</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- No parent to avoid accidentally inheriting parent's dependencyManagement section -->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-multi-modules/gradle.properties
+1 -1
View File
@@ -1 +1 @@
publishing_version = 1.0-5.3-1.6.255-SNAPSHOT
publishing_version = 1.0-5.3-1.7.255-SNAPSHOT
libraries/tools/kotlin-maven-allopen/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-lombok/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-noarg/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-plugin-test/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>kotlin-project</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
libraries/tools/kotlin-maven-plugin/pom.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-serialization/pom.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-osgi-bundle/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>kotlin-project</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
+1 -1
View File
@@ -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:")
libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt
+4 -4
View File
@@ -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)
libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-archetypes-parent</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-archetypes-parent</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
libraries/tools/maven-archetypes/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.6.255-SNAPSHOT</version>
<version>1.7.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
tests/mute-common.csv
-1
View File
@@ -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,,
1 Test key Issue State (optional: MUTE or FAIL) Status (optional: FLAKY)
43 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.Issues.testKt_807
44 org.jetbrains.kotlin.psi.injection.StringInterpolationInjectionTest.testInterpolationSimpleName Stable failure during run may work in debug
45 org.jetbrains.kotlin.shortenRefs.ShortenRefsTestGenerated.testExtensionForObject2 Always red
org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent KT-35567
46 org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLambdas redesign test AsyncStackTraces
47 org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.ConvertToAnonymousObject.testHasConcreateMember2 Unprocessed
48 org.jetbrains.uast.test.kotlin.KotlinUastTypesTest.testEa101715 Unprocessed