Skip to content

Commit f7db503

Browse files
Update kotlin and dokka versions to 1.6.10 (#2274)
1 parent 17cd417 commit f7db503

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Project Settings
2-
dokka_version_base=1.6.0
2+
dokka_version_base=1.6.10
33
dokka_publication_channels=maven-central-snapshot&space-dokka-dev
44
dokka_integration_test_parallelism=2
55
# Versions
6-
kotlin_version=1.6.0
6+
kotlin_version=1.6.10
77
coroutines_version=1.5.1
88
kotlinx_html_version=0.7.3
9-
kotlin_plugin_version=211-1.6.0-release-795-IJ7442.40
9+
kotlin_plugin_version=211-1.6.10-release-923-IJ7442.40
1010
jsoup_version=1.13.1
1111
idea_version=211.7442.40
1212
language_version=1.4

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
2121
androidGradlePluginVersions = listOf("4.0.0")
2222
) + BuildVersions.permutations(
2323
gradleVersions = listOf("7.3"),
24-
kotlinVersions = listOf("1.6.0", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")),
24+
kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", *ifExhaustive("1.4.0", "1.3.72")),
2525
androidGradlePluginVersions = listOf("7.0.0")
2626
)
2727
}

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
1212
@get:Parameters(name = "{0}")
1313
val versions = BuildVersions.permutations(
1414
gradleVersions = listOf("7.3", *ifExhaustive("7.2", "7.0", "6.6", "6.3", "6.2.2", "6.1.1")),
15-
kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0")
15+
kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31", "1.6.0", "1.6.10")
1616
) + BuildVersions.permutations(
1717
gradleVersions = listOf("5.6.4", "6.0"),
1818
kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"))

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra
1111
@get:Parameterized.Parameters(name = "{0}")
1212
val versions = BuildVersions.permutations(
1313
gradleVersions = listOf("7.3", "7.2", "7.0", "6.6", "6.1.1"),
14-
kotlinVersions = listOf("1.6.0", "1.5.31", "1.5.0", "1.4.0")
14+
kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0", "1.4.0")
1515
)
1616
}
1717

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class MultiModule1IntegrationTest(override val versions: BuildVersions) : Abstra
1414
@get:Parameterized.Parameters(name = "{0}")
1515
val versions = BuildVersions.permutations(
1616
gradleVersions = listOf("6.6", "6.6", "6.1.1"),
17-
kotlinVersions = listOf("1.6.0", "1.4.0")
17+
kotlinVersions = listOf("1.6.10", "1.4.0")
1818
)
1919
}
2020

integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac
1212
@get:Parameterized.Parameters(name = "{0}")
1313
val versions = BuildVersions.permutations(
1414
gradleVersions = listOf("7.0", "7.3"),
15-
kotlinVersions = listOf("1.6.0", "1.5.31", "1.5.0")
15+
kotlinVersions = listOf("1.6.10", "1.6.0", "1.5.31", "1.5.0")
1616
)
1717
}
1818

0 commit comments

Comments
 (0)