Skip to content

Commit

Permalink
Update Kotlin to 1.7.10 (#2564)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9fbe33b)
  • Loading branch information
IgnatBeresnev committed Jul 11, 2022
1 parent fa175bd commit b6ba965
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.dokka.gradle.DokkaTask

plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0")
}

Expand Down
2 changes: 1 addition & 1 deletion examples/gradle/dokka-gradle-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import java.net.URL

plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0")
`java-library`
`maven-publish`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.dokka.Platform

plugins {
kotlin("multiplatform") version "1.7.0"
kotlin("multiplatform") version "1.7.10"
id("org.jetbrains.dokka") version "1.7.0"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.7.0"
kotlin("jvm") version "1.7.10"
id("org.jetbrains.dokka") version ("1.7.0") apply false
}

Expand Down
2 changes: 1 addition & 1 deletion examples/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<artifactId>kotlin-maven-example</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<kotlin.version>1.7.0</kotlin.version>
<kotlin.version>1.7.10</kotlin.version>
<dokka.version>1.7.0</dokka.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Project Settings
dokka_version=1.7.0
dokka_version=1.7.10-SNAPSHOT
dokka_integration_test_parallelism=2
# Versions
kotlin_version=1.7.0
kotlin_version=1.7.10
coroutines_version=1.6.0
kotlinx_html_version=0.7.3
kotlin_plugin_version=213-1.7.0-release-281-IJ6777.52
kotlin_plugin_version=213-1.7.10-release-333-IJ6777.52
jsoup_version=1.14.3
idea_version=213.6777.52
language_version=1.4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
dokka_it_android_gradle_plugin_version=4.0.0
android.useAndroidX=true
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
react_version=18.1.0-pre.345
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10

Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.0
dokka_it_kotlin_version=1.7.10
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ internal object TestedVersions {
val BASE =
BuildVersions.permutations(
gradleVersions = listOf("7.4.2", "6.9"),
kotlinVersions = listOf("1.7.0", "1.6.21", "1.5.31", "1.4.32"),
kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"),
) + BuildVersions.permutations(
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0"))
Expand All @@ -18,11 +18,11 @@ internal object TestedVersions {
val ANDROID =
BuildVersions.permutations(
gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
kotlinVersions = listOf("1.7.0", "1.6.21", "1.5.31", "1.4.32"),
kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"),
androidGradlePluginVersions = listOf("7.2.0")
) + BuildVersions.permutations(
gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")),
kotlinVersions = listOf("1.7.0", "1.6.21", "1.5.31", "1.4.32"),
kotlinVersions = listOf("1.7.10", "1.6.21", "1.5.31", "1.4.32"),
androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3"))
)

Expand All @@ -32,6 +32,6 @@ internal object TestedVersions {
"1.6.0" to "-Preact_version=17.0.2-pre.280-kotlin-1.6.0",
"1.5.31" to "-Preact_version=17.0.2-pre.265-kotlin-1.5.31",
"1.6.21" to "-Preact_version=18.0.0-pre.332-kotlin-1.6.21",
"1.7.0" to "-Preact_version=18.1.0-pre.345"
"1.7.10" to "-Preact_version=18.2.0-pre.351" // TODO update to confirmed 1.7.10
)
}
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 @@ -7,7 +7,7 @@
<version>1.0-SNAPSHOT</version>

<properties>
<kotlin.version>1.7.0</kotlin.version>
<kotlin.version>1.7.10</kotlin.version>
</properties>
<build>
<plugins>
Expand Down

0 comments on commit b6ba965

Please sign in to comment.