Fix null safety of Gradle Kotlin scripts with Gradle 9

wilkinsona · wilkinsona · commit 27c96d910986 · 2025-08-20T12:32:10.000+01:00
See gh-46923
diff --git a/build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-bind-caches.gradle.kts b/build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-bind-caches.gradle.kts
@@ -27,8 +27,8 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
 tasks.register("bootBuildImageCaches") {
 	doFirst {
-		println("buildWorkspace=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildWorkspace.asCache().bind.source)
-		println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache().bind.source)
-		println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache().bind.source)
+		println("buildWorkspace=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildWorkspace.asCache()?.bind?.source)
+		println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache()?.bind?.source)
+		println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache()?.bind?.source)
 	}
 }
diff --git a/build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-caches.gradle.kts b/build-plugin/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/packaging/boot-build-image-caches.gradle.kts
@@ -22,7 +22,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
 tasks.register("bootBuildImageCaches") {
 	doFirst {
-		println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache().volume.name)
-		println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache().volume.name)
+		println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache()?.volume?.name)
+		println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache()?.volume?.name)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ tasks.named<BootBuildImage>("bootBuildImage") {`
`27`	`27`
`28`	`28`	`tasks.register("bootBuildImageCaches") {`
`29`	`29`	`doFirst {`
`30`		`- println("buildWorkspace=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildWorkspace.asCache().bind.source)`
`31`		`- println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache().bind.source)`
`32`		`- println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache().bind.source)`
	`30`	`+ println("buildWorkspace=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildWorkspace.asCache()?.bind?.source)`
	`31`	`+ println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache()?.bind?.source)`
	`32`	`+ println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache()?.bind?.source)`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {`
`22`	`22`
`23`	`23`	`tasks.register("bootBuildImageCaches") {`
`24`	`24`	`doFirst {`
`25`		`- println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache().volume.name)`
`26`		`- println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache().volume.name)`
	`25`	`+ println("buildCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").buildCache.asCache()?.volume?.name)`
	`26`	`+ println("launchCache=" + tasks.getByName<BootBuildImage>("bootBuildImage").launchCache.asCache()?.volume?.name)`
`27`	`27`	`}`
`28`	`28`	`}`