bumping to gradle 9.5.0, updating build convention dependencies

Jolanrensen · Jolanrensen · commit 856e659108bc · 2026-04-29T17:08:38.000+02:00
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -21,7 +21,7 @@ ktlint {
 dependencies {
     // Add a dependency on the Kotlin Gradle plugin so that convention plugins can apply it.
     implementation(libs.kotlin.gradle.plugin)
-    implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:$expectedKotlinDslPluginsVersion")
+    compileOnly("org.gradle.kotlin:gradle-kotlin-dsl-plugins:$expectedKotlinDslPluginsVersion")
 
     // So we can create pretty tables in gradle task outputs, parse json, and rename to camelCase
     implementation(libs.dataframe.release.core)
diff --git a/build-logic/src/main/kotlin/dfbuild.buildConfig.gradle.kts b/build-logic/src/main/kotlin/dfbuild.buildConfig.gradle.kts
@@ -1,7 +1,8 @@
-@file:OptIn(ExperimentalBuildToolsApi::class)
+@file:OptIn(ExperimentalBuildToolsApi::class, ExperimentalKotlinGradlePluginApi::class)
 
 import org.gradle.kotlin.dsl.support.uppercaseFirstChar
 import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(convention.plugins.kotlinJvmCommon)
@@ -21,14 +22,14 @@ buildConfig {
 val buildConfigSources by kotlin.sourceSets.creating {
     kotlin.srcDir("build/generated/sources/buildConfig/main")
 }
-tasks.generateBuildConfig {
+tasks.generateBuildConfigClasses {
     finalizedBy(
         "runKtlintFormatOver${buildConfigSources.name.uppercaseFirstChar()}SourceSet",
     )
 }
 tasks.named { "Ktlint" in it && "Check" in it }.configureEach {
     dependsOn(
-        tasks.generateBuildConfig,
+        tasks.generateBuildConfigClasses,
         "runKtlintFormatOver${buildConfigSources.name.uppercaseFirstChar()}SourceSet",
     )
 }
diff --git a/build-settings-logic/settings.gradle.kts b/build-settings-logic/settings.gradle.kts
@@ -17,7 +17,7 @@ pluginManagement {
 // versions should be kept in sync with `gradle/libs.versions.toml`
 plugins {
     // cannot be applied here, it's an early-evaluated included build
-    id("dev.panuszewski.typesafe-conventions") version "0.10.0" apply false
+    id("dev.panuszewski.typesafe-conventions") version "0.10.1" apply false
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
diff --git a/build-settings-logic/src/main/kotlin/dfsettings.base.settings.gradle.kts b/build-settings-logic/src/main/kotlin/dfsettings.base.settings.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 val jupyterApiTCRepo: String? by settings
 
 dependencyResolutionManagement {
diff --git a/build-settings-logic/src/main/kotlin/dfsettings.catalogs-inside-convention-plugins.settings.gradle.kts b/build-settings-logic/src/main/kotlin/dfsettings.catalogs-inside-convention-plugins.settings.gradle.kts
@@ -1,11 +1,9 @@
-import dev.panuszewski.gradle.TypesafeConventionsExtension
-
 plugins {
     id("dfsettings.catalogs")
     id("dev.panuszewski.typesafe-conventions")
 }
 
-extensions.getByType<TypesafeConventionsExtension>().apply {
+typesafeConventions {
     // prevents convention plugins being applied as `dependencies { implementation() }`
     autoPluginDependencies = false
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -272,7 +272,7 @@ tasks.withType<Jar> {
 }
 
 tasks.processKDocsMain {
-    dependsOn(tasks.generateKeywordsSrc, tasks.generateBuildConfig)
+    dependsOn(tasks.generateKeywordsSrc, tasks.generateBuildConfigClasses)
 }
 
 tasks.runKtlintFormatOverMainSourceSet {
diff --git a/examples/projects/android-example/gradle/wrapper/gradle-wrapper.properties b/examples/projects/android-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/dev/android-example/gradle/wrapper/gradle-wrapper.properties b/examples/projects/dev/android-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/dev/kotlin-dataframe-plugin-gradle-example/gradle/wrapper/gradle-wrapper.properties b/examples/projects/dev/kotlin-dataframe-plugin-gradle-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/dev/movies/gradle/wrapper/gradle-wrapper.properties b/examples/projects/dev/movies/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/dev/spark-parquet-dataframe/gradle/wrapper/gradle-wrapper.properties b/examples/projects/dev/spark-parquet-dataframe/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/dev/youtube/gradle/wrapper/gradle-wrapper.properties b/examples/projects/dev/youtube/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/kotlin-dataframe-plugin-gradle-example/gradle/wrapper/gradle-wrapper.properties b/examples/projects/kotlin-dataframe-plugin-gradle-example/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/movies/gradle/wrapper/gradle-wrapper.properties b/examples/projects/movies/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/spark-parquet-dataframe/gradle/wrapper/gradle-wrapper.properties b/examples/projects/spark-parquet-dataframe/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/projects/youtube/gradle/wrapper/gradle-wrapper.properties b/examples/projects/youtube/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ dataframe-ksp = "1.0.0-Beta4"
 korro = "0.1.7"
 
 gradlePlugin-gradle-foojayToolchains = "1.0.0"
-typesafe-conventions = "0.10.0"
+typesafe-conventions = "0.10.1"
 maven-invoker = "3.3.0"
 maven-wrapper = "3.3.4"
 maven = "3.9.11"
@@ -65,7 +65,7 @@ ktor = "3.4.2"
 kotlin-compile-testing = "0.7.1"
 hikari = "7.0.2"
 duckdb = "1.4.2.0"
-buildconfig = "5.6.7"
+buildconfig = "6.0.9"
 benchmark = "0.4.16"
 
 geotools = "33.5" # 34.x and higher versions are not compatible with Java 11
@@ -167,7 +167,7 @@ sl4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "sl4j" }
 sl4jsimple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "sl4j" }
 android-gradle-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "android-gradle-api" }
 android-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-api" }
-kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin" }
 kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api" }
 ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
 kotlin-compile-testing = { group = "dev.zacsweers.kctfork", name = "core", version.ref = "kotlin-compile-testing" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`		`-@file:OptIn(ExperimentalBuildToolsApi::class)`
	`1`	`+@file:OptIn(ExperimentalBuildToolsApi::class, ExperimentalKotlinGradlePluginApi::class)`
`2`	`2`
`3`	`3`	`import org.gradle.kotlin.dsl.support.uppercaseFirstChar`
`4`	`4`	`import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi`
	`5`	`+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi`
`5`	`6`
`6`	`7`	`plugins {`
`7`	`8`	`alias(convention.plugins.kotlinJvmCommon)`
`@@ -21,14 +22,14 @@ buildConfig {`
`21`	`22`	`val buildConfigSources by kotlin.sourceSets.creating {`
`22`	`23`	`kotlin.srcDir("build/generated/sources/buildConfig/main")`
`23`	`24`	`}`
`24`		`-tasks.generateBuildConfig {`
	`25`	`+tasks.generateBuildConfigClasses {`
`25`	`26`	`finalizedBy(`
`26`	`27`	`"runKtlintFormatOver${buildConfigSources.name.uppercaseFirstChar()}SourceSet",`
`27`	`28`	`)`
`28`	`29`	`}`
`29`	`30`	`tasks.named { "Ktlint" in it && "Check" in it }.configureEach {`
`30`	`31`	`dependsOn(`
`31`		`- tasks.generateBuildConfig,`
	`32`	`+ tasks.generateBuildConfigClasses,`
`32`	`33`	`"runKtlintFormatOver${buildConfigSources.name.uppercaseFirstChar()}SourceSet",`
`33`	`34`	`)`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ pluginManagement {`
`17`	`17`	// versions should be kept in sync with `gradle/libs.versions.toml`
`18`	`18`	`plugins {`
`19`	`19`	`// cannot be applied here, it's an early-evaluated included build`
`20`		`- id("dev.panuszewski.typesafe-conventions") version "0.10.0" apply false`
	`20`	`+ id("dev.panuszewski.typesafe-conventions") version "0.10.1" apply false`
`21`	`21`	`id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@file:Suppress("UnstableApiUsage")`
	`2`	`+`
`1`	`3`	`val jupyterApiTCRepo: String? by settings`
`2`	`4`
`3`	`5`	`dependencyResolutionManagement {`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`		`-import dev.panuszewski.gradle.TypesafeConventionsExtension`
`2`		`-`
`3`	`1`	`plugins {`
`4`	`2`	`id("dfsettings.catalogs")`
`5`	`3`	`id("dev.panuszewski.typesafe-conventions")`
`6`	`4`	`}`
`7`	`5`
`8`		`-extensions.getByType<TypesafeConventionsExtension>().apply {`
	`6`	`+typesafeConventions {`
`9`	`7`	// prevents convention plugins being applied as `dependencies { implementation() }`
`10`	`8`	`autoPluginDependencies = false`
`11`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ tasks.withType<Jar> {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`tasks.processKDocsMain {`
`275`		`- dependsOn(tasks.generateKeywordsSrc, tasks.generateBuildConfig)`
	`275`	`+ dependsOn(tasks.generateKeywordsSrc, tasks.generateBuildConfigClasses)`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`tasks.runKtlintFormatOverMainSourceSet {`