Skip to content

Commit 57c217e

Browse files
bnormSpace Team
authored and
Space Team
committed
[Build] Use language version 2.2 to build Kotlin
^KT-74254 Fixed
1 parent 2cd91e2 commit 57c217e

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ defaultSnapshotVersion=2.2.255-SNAPSHOT
3131
# * Kotlin stdlib buildscripts
3232
# * compiler-hosted/integration-tests/build.gradle.kts
3333
# * `configureKotlinCompileTasksGradleCompatibility()` calls
34-
kotlinLanguageVersion=2.1
34+
kotlinLanguageVersion=2.2
3535

3636
# Should be less or equal to the Kotlin stdlib version used inside IntelliJ IDEA repository, see KT-62510.
3737
# IntelliJ IDEA Kotlin stdlib version can be found at https://github.com/JetBrains/intellij-community/blob/master/.idea/libraries/kotlin_stdlib.xml

libraries/kotlinx-metadata/jvm/test/kotlin/metadata/test/DifferentVersionsTest.kt

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package kotlin.metadata.test
77

88
import kotlin.metadata.jvm.KotlinClassMetadata
99
import org.jetbrains.kotlin.metadata.deserialization.MetadataVersion
10-
import org.junit.jupiter.api.Disabled
1110
import org.junit.jupiter.api.Test
1211
import kotlin.test.assertContentEquals
1312
import kotlin.test.assertFailsWith
@@ -28,7 +27,6 @@ class DifferentVersionsTest {
2827
)
2928

3029
@Test
31-
@Disabled("Enable when KT-74254 is fixed")
3230
fun readsCurrentVersion() {
3331
assertContentEquals(MetadataVersion.INSTANCE.toArray(), metadata.metadataVersion)
3432
assertIs<KotlinClassMetadata.Class>(KotlinClassMetadata.readStrict(metadata))

libraries/kotlinx-metadata/jvm/test/kotlin/metadata/test/JavaUsageTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import kotlin.metadata.jvm.JvmMetadataVersion;
1111
import kotlin.metadata.jvm.KotlinClassHeader;
1212
import kotlin.metadata.jvm.KotlinClassMetadata;
13-
import org.junit.jupiter.api.Disabled;
1413
import org.junit.jupiter.api.Test;
1514
import static org.junit.jupiter.api.Assertions.*;
1615

@@ -28,7 +27,6 @@ public void testKotlinClassHeader() {
2827
}
2928

3029
@Test
31-
@Disabled("Enable when KT-74254 is fixed")
3230
public void testWritingBackWithDefaults() {
3331
Metadata m = MetadataSmokeTest.class.getAnnotation(Metadata.class);
3432
KotlinClassMetadata clazz1 = ((KotlinClassMetadata) Objects.requireNonNull(KotlinClassMetadata.readStrict(m)));

libraries/kotlinx-metadata/jvm/test/kotlin/metadata/test/WritersContractTest.kt

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package kotlin.metadata.test
77

8-
import org.junit.jupiter.api.Disabled
98
import org.junit.jupiter.api.Test
109
import kotlin.metadata.jvm.JvmMetadataVersion
1110
import kotlin.metadata.jvm.KotlinClassMetadata
@@ -62,7 +61,6 @@ class WritersContractTest {
6261
}
6362

6463
@Test
65-
@Disabled("Enable when KT-74254 is fixed")
6664
fun nextVersionWrite() = everyType.forEach { before ->
6765
val md = KotlinClassMetadata.readStrict(before)
6866
val ver = md.version

0 commit comments

Comments
 (0)