Skip to content

Commit b6fdb44

Browse files
Copilotkarianna
andcommitted
Fix Gradle 9.3.0 compatibility by replacing project.exec with exec in doLast blocks
Co-authored-by: karianna <[email protected]>
1 parent 397c33f commit b6fdb44

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

linux/ca-certificates/debian/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ task packageCaCertificatesDebian {
7878
def containerRegistry = getContainerRegistry()
7979

8080
doLast {
81-
project.copy {
81+
copy {
8282
from("src/main/packaging/")
8383
into("${buildDir}/generated/packaging")
8484
}
85-
project.exec {
85+
exec {
8686
workingDir "src/main/packaging"
8787
commandLine "docker", "build", "--no-cache", "--pull",
8888
"-t", "adoptium-packages-linux-cacerts-debian",
@@ -91,7 +91,7 @@ task packageCaCertificatesDebian {
9191
getProjectDir().absolutePath + "/src/main/packaging"
9292
}
9393

94-
project.exec {
94+
exec {
9595
workingDir getRootDir()
9696
commandLine "docker", "run", "--rm",
9797
"--mount", "type=bind,source=${buildDir},target=/home/builder/build",

linux/jdk/debian/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ task packageJdkDebian {
8282
throw new IllegalArgumentException("Input directory '$input_dir' not found")
8383
}
8484

85-
project.copy {
85+
copy {
8686
from("src/main/packaging/$product/$productVersion/")
8787
into("${buildDir}/generated/packaging")
8888
}
@@ -105,7 +105,7 @@ task packageJdkDebian {
105105
println "The Value Of ARCH is: $arch"
106106

107107
if ("$arch" == "armhf") {
108-
project.exec {
108+
exec {
109109
workingDir "src/main/packaging"
110110
commandLine "docker", "build", "--no-cache", "--pull",
111111
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
@@ -117,7 +117,7 @@ task packageJdkDebian {
117117
}
118118

119119
if ("$arch" == "riscv64") {
120-
project.exec {
120+
exec {
121121
workingDir "src/main/packaging"
122122
commandLine "docker", "build", "--no-cache", "--pull",
123123
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
@@ -129,7 +129,7 @@ task packageJdkDebian {
129129
}
130130

131131
if ("$arch" != "armhf" && "$arch" != "riscv64"){
132-
project.exec {
132+
exec {
133133
workingDir "src/main/packaging"
134134
commandLine "docker", "build", "--no-cache", "--pull",
135135
"-t", "adoptium-packages-linux-jdk-debian",
@@ -139,7 +139,7 @@ task packageJdkDebian {
139139
}
140140
}
141141

142-
project.exec {
142+
exec {
143143
workingDir getRootDir()
144144
commandLine "docker", "run",
145145
"--rm",

linux/jre/debian/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ task packageJreDebian {
8282
throw new IllegalArgumentException("Input directory '$input_dir' not found")
8383
}
8484

85-
project.copy {
85+
copy {
8686
from("src/main/packaging/$product/$productVersion/")
8787
into("${buildDir}/generated/packaging")
8888
}
@@ -106,7 +106,7 @@ task packageJreDebian {
106106

107107

108108
if ("$arch" == "armhf") {
109-
project.exec {
109+
exec {
110110
workingDir "src/main/packaging"
111111
commandLine "docker", "build", "--no-cache", "--pull",
112112
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
@@ -118,7 +118,7 @@ task packageJreDebian {
118118
}
119119

120120
if ("$arch" == "riscv64") {
121-
project.exec {
121+
exec {
122122
workingDir "src/main/packaging"
123123
commandLine "docker", "build", "--no-cache", "--pull",
124124
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
@@ -130,7 +130,7 @@ task packageJreDebian {
130130
}
131131

132132
if ("$arch" != "armhf" && "$arch" != "riscv64"){
133-
project.exec {
133+
exec {
134134
workingDir "src/main/packaging"
135135
commandLine "docker", "build", "--no-cache", "--pull",
136136
"-t", "adoptium-packages-linux-jdk-debian",
@@ -140,7 +140,7 @@ task packageJreDebian {
140140
}
141141
}
142142

143-
project.exec {
143+
exec {
144144
workingDir getRootDir()
145145
commandLine "docker", "run",
146146
"--rm",

0 commit comments

Comments
 (0)