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

Switch kotlin version to 1.9

Browse Source 
with appropriate fixes in testdata, tests and other
places.
This commit is contained in:
Dmitriy Novozhilov
2022-11-21 18:01:37 +02:00
committed by Space Team
parent e2403c801f
commit 66544a4e00
29 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-annotation-processing-maven/pom.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.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.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- No parent to avoid accidentally inheriting parent's dependencyManagement section -->
libraries/tools/kotlin-dist-for-jps-meta/pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<parent>
<artifactId>kotlin-project</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt
+2 -2
View File
@@ -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"),
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt
+2 -2
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+2 -2
View File
@@ -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?
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.8.255-SNAPSHOT
publishing_version = 1.0-5.3-1.9.255-SNAPSHOT
libraries/tools/kotlin-gradle-statistics/src/test/kotlin/MetricPolicyTest.kt
+3 -3
View File
@@ -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")
}
}
}
libraries/tools/kotlin-maven-allopen/pom.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-lombok/pom.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-noarg/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.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.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
libraries/tools/kotlin-maven-plugin/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
libraries/tools/kotlin-maven-serialization/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.8.255-SNAPSHOT</version>
<version>1.9.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.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle
+2 -2
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.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))
}
}
}
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.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)
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.8.255-SNAPSHOT</version>
<version>1.9.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.8.255-SNAPSHOT</version>
<version>1.9.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.8.255-SNAPSHOT</version>
<version>1.9.255-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>