Skip to content

Commit c136621

Browse files
authored
build: migrate deprecated gradle features (#663)
Signed-off-by: Jakob Steiner <jakob.steiner@glasskube.eu>
1 parent e3b48b3 commit c136621

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

operator/build.gradle.kts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
34

@@ -38,10 +39,10 @@ java {
3839
}
3940

4041
tasks.withType<KotlinCompile> {
41-
kotlinOptions {
42-
jvmTarget = "${JavaVersion.VERSION_17}"
43-
javaParameters = true
44-
freeCompilerArgs = listOf("-Xjsr305=strict")
42+
compilerOptions {
43+
jvmTarget.set(JvmTarget.JVM_17)
44+
javaParameters.set(true)
45+
freeCompilerArgs.set(listOf("-Xjsr305=strict"))
4546
}
4647
}
4748

@@ -80,11 +81,15 @@ gitProperties {
8081
dotGitDirectory = rootProject.layout.projectDirectory.dir(".git")
8182
}
8283

83-
tasks.create("clearCrd", Delete::class) {
84+
tasks.register("clearCrd", Delete::class) {
85+
group = "build"
86+
description = "Clears the CRD directory before copy"
8487
delete = setOf("../deploy/crd")
8588
}
8689

87-
tasks.create("copyCrd", Copy::class) {
90+
tasks.register("copyCrd", Copy::class) {
91+
group = "build"
92+
description = "Copies the CRD YAML files generated by the fabric8 generator"
8893
dependsOn("kaptKotlin")
8994
dependsOn("clearCrd")
9095
from("build/tmp/kapt3/classes/main/META-INF/fabric8") {
@@ -95,8 +100,9 @@ tasks.create("copyCrd", Copy::class) {
95100

96101
tasks.findByName("classes")!!.dependsOn("copyCrd")
97102

98-
tasks.create("installCrd", Exec::class) {
103+
tasks.register("installCrd", Exec::class) {
99104
group = "kubernetes"
105+
description = "Installs the CRD into the cluster defined in current kubeconfig"
100106
dependsOn("copyCrd")
101107
commandLine(
102108
"kubectl",
@@ -106,8 +112,9 @@ tasks.create("installCrd", Exec::class) {
106112
)
107113
}
108114

109-
tasks.create("loadImage", Exec::class) {
115+
tasks.register("loadImage", Exec::class) {
110116
group = "kubernetes"
117+
description = "Loads the locally built container image into the minikube daemon"
111118
dependsOn("bootBuildImage")
112119
commandLine(
113120
"minikube",

0 commit comments

Comments
 (0)