Skip to content

Commit 0d4c052

Browse files
authored
Merge pull request #599 from Kotlin/version-bumps
Version bumping Dokka to 1.9.10
2 parents 4e5625c + a39cec6 commit 0d4c052

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ plugins {
1919
alias(dokka)
2020
alias(kover)
2121
alias(kotlinter)
22+
alias(korro) apply false
2223
alias(docProcessor) apply false
2324
alias(simpleGit) apply false
2425
alias(dependencyVersions)
@@ -79,8 +80,8 @@ val dependencyUpdateExclusions = listOf(
7980
libs.kotestAssertions.get().name,
8081
// Can't be updated to 7.4.0+ due to Java 8 compatibility
8182
libs.android.gradle.api.get().group,
82-
// TODO 1.9.10 requires korro and docProcessor to update, https://github.com/Kotlin/dataframe/issues/596
83-
libs.plugins.dokka.get().pluginId,
83+
// TODO 0.1.6 breaks ktlint, https://github.com/Kotlin/dataframe/issues/598
84+
libs.plugins.korro.get().pluginId,
8485
// Directly dependent on the Gradle version
8586
"org.gradle.kotlin.kotlin-dsl",
8687
)

gradle/libs.versions.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ ktlint = "3.4.5"
99
# make sure to sync manually with :generator module
1010
kotlin = "1.9.22"
1111
kotlinpoet = "1.16.0"
12-
13-
# TODO 1.9.10 requires korro and docProcessor to update
14-
# https://github.com/Kotlin/dataframe/issues/596
15-
dokka = "1.8.10"
12+
dokka = "1.9.10"
1613

1714
libsPublisher = "1.8.10-dev-43"
1815

1916
# "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
2017
# dogfood Gradle / KSP plugins in tests and idea-examples modules
2118
dataframe = "0.13.0-dev-2838"
2219

20+
# TODO 0.1.6 breaks ktlint, https://github.com/Kotlin/dataframe/issues/598
2321
korro = "0.1.5"
2422

2523
# TODO Requires more work to be updated to 0.7.0+

0 commit comments

Comments
 (0)