Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version bumping Dokka to 1.9.10 #599

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Version bumping Dokka to 1.9.10 #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
531d2e1
updating korro to 0.1.6 and dokka to 1.9.10
Jolanrensen Feb 22, 2024
56e7b44
keeping korro at 0.1.5 and dokka to 1.9.10
Jolanrensen Feb 22, 2024
e2a154c
Merge branch 'master' into version-bumps
Jolanrensen Feb 22, 2024
a39cec6
updating todo comments
Jolanrensen Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
alias(dokka)
alias(kover)
alias(kotlinter)
alias(korro) apply false
alias(docProcessor) apply false
alias(simpleGit) apply false
alias(dependencyVersions)
Expand Down Expand Up @@ -79,8 +80,8 @@ val dependencyUpdateExclusions = listOf(
libs.kotestAssertions.get().name,
// Can't be updated to 7.4.0+ due to Java 8 compatibility
libs.android.gradle.api.get().group,
// TODO 1.9.10 requires korro and docProcessor to update, https://github.com/Kotlin/dataframe/issues/596
libs.plugins.dokka.get().pluginId,
// TODO 0.1.6 breaks ktlint, https://github.com/Kotlin/dataframe/issues/598
libs.plugins.korro.get().pluginId,
// Directly dependent on the Gradle version
"org.gradle.kotlin.kotlin-dsl",
)
Expand Down
6 changes: 2 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ ktlint = "3.4.5"
# make sure to sync manually with :generator module
kotlin = "1.9.22"
kotlinpoet = "1.16.0"

# TODO 1.9.10 requires korro and docProcessor to update
# https://github.com/Kotlin/dataframe/issues/596
dokka = "1.8.10"
dokka = "1.9.10"

libsPublisher = "1.8.10-dev-43"

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

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

# TODO Requires more work to be updated to 0.7.0+
Expand Down