From 531d2e170d6eae29ebe89be195bfd43a51504d4b Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 22 Feb 2024 13:51:52 +0100 Subject: [PATCH 1/3] updating korro to 0.1.6 and dokka to 1.9.10 --- build.gradle.kts | 1 + gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b66b7783ef..8d2f7744d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b0b7b7cdb..04d5109b80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ 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" @@ -20,7 +20,7 @@ libsPublisher = "1.8.10-dev-43" # dogfood Gradle / KSP plugins in tests and idea-examples modules dataframe = "0.13.0-dev-2838" -korro = "0.1.5" +korro = "0.1.6" # TODO Requires more work to be updated to 0.7.0+ # https://github.com/Kotlin/dataframe/issues/594 From 56e7b4416ba9a2bb68153abb85d7aea0d99bb0d5 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 22 Feb 2024 14:28:17 +0100 Subject: [PATCH 2/3] keeping korro at 0.1.5 and dokka to 1.9.10 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 04d5109b80..17cf510bc8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ libsPublisher = "1.8.10-dev-43" # dogfood Gradle / KSP plugins in tests and idea-examples modules dataframe = "0.13.0-dev-2838" -korro = "0.1.6" +korro = "0.1.5" # TODO Requires more work to be updated to 0.7.0+ # https://github.com/Kotlin/dataframe/issues/594 From a39cec6e0a91da9512cb3b435bf5916b577695a3 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 22 Feb 2024 14:53:03 +0100 Subject: [PATCH 3/3] updating todo comments --- build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8d2f7744d6..956189647c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,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", ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17cf510bc8..b25c1e87fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,9 +9,6 @@ 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.9.10" libsPublisher = "1.8.10-dev-43" @@ -20,6 +17,7 @@ libsPublisher = "1.8.10-dev-43" # 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+