Skip to content

Commit

Permalink
Update Kotlin to 1.9.10 (#3158)
Browse files Browse the repository at this point in the history
  • Loading branch information
vmishenev committed Sep 4, 2023
1 parent 61619d5 commit 8065a0d
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]

gradlePlugin-kotlin = "1.9.0"
gradlePlugin-kotlin = "1.9.10"
# See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
gradlePlugin-android = "4.2.2"
gradlePlugin-dokka = "1.9.0"
Expand All @@ -10,7 +10,7 @@ kotlinx-collections-immutable = "0.3.4"
kotlinx-bcv = "0.12.1"

## Analysis
kotlin-compiler = "1.9.0"
kotlin-compiler = "1.9.10"
kotlin-compiler-k2 = "1.9.0-release-358"

# MUST match the version of the intellij platform used in the kotlin compiler,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
dokka_it_android_gradle_plugin_version=4.2.2
android.useAndroidX=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
fail_on_warning=false
report_undocumented=false
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
react_version=18.2.0-pre.467
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
#these flags are enabled by default since 1.6.20.
#remove when this test is executed with Kotlin >= 1.6.20
kotlin.mpp.enableGranularSourceSetsMetadata=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
task_number=100
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

dokka_it_kotlin_version=1.9.0
dokka_it_kotlin_version=1.9.10
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ internal open class AllSupportedTestedVersionsArgumentsProvider : TestedVersions

internal object TestedVersions {

val LATEST = BuildVersions("7.6.2", "1.9.0")
val LATEST = BuildVersions("7.6.2", "1.9.10")

/**
* All supported Gradle/Kotlin versions, including [LATEST]
Expand All @@ -23,8 +23,8 @@ internal object TestedVersions {
*/
val ALL_SUPPORTED =
BuildVersions.permutations(
gradleVersions = listOf("6.9"),
kotlinVersions = listOf("1.8.20", "1.7.20", "1.6.21", "1.5.31"),
gradleVersions = listOf("7.6.2"),
kotlinVersions = listOf("1.9.0", "1.8.20", "1.7.20", "1.6.21", "1.5.31"),
) + BuildVersions.permutations(
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
kotlinVersions = listOf(*ifExhaustive( "1.8.0", "1.7.0", "1.6.0", "1.5.0"))
Expand Down Expand Up @@ -60,6 +60,7 @@ internal object TestedVersions {
"1.8.10" to "18.2.0-pre.490",
"1.8.20" to "18.2.0-pre.546",
"1.9.0" to "18.2.0-pre.597",
"1.9.10" to "18.2.0-pre.597",
)
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/maven/projects/it-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<version>1.0-SNAPSHOT</version>

<properties>
<kotlin.version>1.9.0</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
</properties>
<build>
<plugins>
Expand Down

0 comments on commit 8065a0d

Please sign in to comment.