Skip to content

Commit 7419f8b

Browse files
committed
version bumping: publish-plugin, libsPublisher, discovered issues with dokka
1 parent 9727892 commit 7419f8b

File tree

3 files changed

+16
-27
lines changed

3 files changed

+16
-27
lines changed

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ val dependencyUpdateExclusions = listOf(
7474
libs.plugins.kotlinter.get().pluginId, // Updating requires major changes all across the project
7575
libs.kotestAssertions.get().name, // 5.8.0 is not possible due to https://github.com/Kotlin/kotlin-jupyter/issues/452
7676
libs.android.gradle.api.get().group, // Can't be updated to 7.4.0+ due to Java 8 compatibility
77+
libs.plugins.dokka.get().pluginId, // 1.9.10 required korro and docProcessor to update
78+
"org.gradle.kotlin.kotlin-dsl", // Directly dependent on the Gradle version
7779
)
7880

7981
// run `./gradlew dependencyUpdates` to check for updates

gradle/libs.versions.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ ktlint = "3.4.5" # Updating requires major changes all across the project
77
kotlin = "1.9.22"
88
kotlinpoet = "1.16.0"
99

10+
# TODO 1.9.10 required korro and docProcessor to update:
11+
# https://github.com/devcrocod/korro/issues/8
12+
# https://github.com/Jolanrensen/docProcessorGradlePlugin/issues/42
1013
dokka = "1.8.10"
11-
libsPublisher = "0.0.60-dev-30"
14+
15+
libsPublisher = "1.8.10-dev-43"
1216
# "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
1317
# dogfood Gradle / KSP plugins in tests and idea-examples modules
1418
dataframe = "0.13.0-dev-2838"
@@ -42,7 +46,7 @@ arrow = "15.0.0"
4246
docProcessor = "0.3.2"
4347
simpleGit = "2.0.3"
4448
dependencyVersions = "0.51.0"
45-
plugin-publish = "0.15.0"
49+
plugin-publish = "1.2.1"
4650
shadow = "8.1.1"
4751
android-gradle-api = "7.3.1" # Can't be updated to 7.4.0+ due to Java 8 compatibility
4852
ktor-server-netty = "2.3.8"

plugins/dataframe-gradle-plugin/build.gradle.kts

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,43 +60,26 @@ tasks.withType<ProcessResources> {
6060
}
6161

6262
gradlePlugin {
63-
plugins {
64-
create("schemaGeneratorPlugin") {
65-
id = "org.jetbrains.kotlinx.dataframe"
66-
implementationClass = "org.jetbrains.dataframe.gradle.ConvenienceSchemaGeneratorPlugin"
67-
}
68-
create("deprecatedSchemaGeneratorPlugin") {
69-
id = "org.jetbrains.kotlin.plugin.dataframe"
70-
implementationClass = "org.jetbrains.dataframe.gradle.DeprecatingSchemaGeneratorPlugin"
71-
}
72-
}
73-
}
74-
75-
76-
pluginBundle {
7763
// These settings are set for the whole plugin bundle
7864
website = "https://github.com/Kotlin/dataframe"
7965
vcsUrl = "https://github.com/Kotlin/dataframe"
8066

81-
(plugins) {
82-
"schemaGeneratorPlugin" {
83-
// id is captured from java-gradle-plugin configuration
67+
plugins {
68+
create("schemaGeneratorPlugin") {
69+
id = "org.jetbrains.kotlinx.dataframe"
70+
implementationClass = "org.jetbrains.dataframe.gradle.ConvenienceSchemaGeneratorPlugin"
8471
displayName = "Kotlin Dataframe gradle plugin"
8572
description = "Gradle plugin providing task for inferring data schemas from your CSV or JSON data"
8673
tags = listOf("dataframe", "kotlin")
8774
}
88-
"deprecatedSchemaGeneratorPlugin" {
89-
// id is captured from java-gradle-plugin configuration
75+
create("deprecatedSchemaGeneratorPlugin") {
76+
id = "org.jetbrains.kotlin.plugin.dataframe"
77+
implementationClass = "org.jetbrains.dataframe.gradle.DeprecatingSchemaGeneratorPlugin"
9078
displayName = "Kotlin Dataframe gradle plugin"
91-
description =
92-
"The plugin was moved to 'org.jetbrains.kotlinx.dataframe'. Gradle plugin providing task for inferring data schemas from your CSV or JSON data"
79+
description = "The plugin was moved to 'org.jetbrains.kotlinx.dataframe'. Gradle plugin providing task for inferring data schemas from your CSV or JSON data"
9380
tags = listOf("dataframe", "kotlin")
9481
}
9582
}
96-
97-
mavenCoordinates {
98-
groupId = project.group.toString()
99-
}
10083
}
10184

10285
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {

0 commit comments

Comments
 (0)