Skip to content

Commit a25cead

Browse files
obiguobigu
authored
Update missing build.gradle files with new syntax for registering tasks (libgdx#7270)
* Update missing build.gradle files with new syntax for registering tasks * Rollback beforeRun task to previous syntax
1 parent 8e3b2ef commit a25cead

File tree

8 files changed

+63
-55
lines changed

8 files changed

+63
-55
lines changed

‎backends/gdx-backend-robovm-metalangle/build.gradle

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
generatorImplementation 'com.github.javaparser:javaparser-core:3.24.2'
4646
}
4747

48-
task generate(type: JavaExec) {
48+
tasks.register('generate', JavaExec) {
4949
dependsOn configurations.generator
5050

5151
mainClass = 'JavaCodeGenerator'
@@ -55,7 +55,7 @@ task generate(type: JavaExec) {
5555
outputs.dir 'src/'
5656
}
5757

58-
task fetchMetalANGLE(type: Download) {
58+
tasks.register('fetchMetalANGLE', Download) {
5959
doFirst {
6060
file("build/tmp").mkdirs();
6161
}
@@ -65,7 +65,7 @@ task fetchMetalANGLE(type: Download) {
6565
useETag "all"
6666
}
6767

68-
task fetchMetalANGLESimulator(type: Download) {
68+
tasks.register('fetchMetalANGLESimulator', Download) {
6969
doFirst {
7070
file("build/tmp").mkdirs();
7171
}
@@ -75,38 +75,40 @@ task fetchMetalANGLESimulator(type: Download) {
7575
useETag "all"
7676
}
7777

78-
task verifyMetalANGLE(dependsOn: fetchMetalANGLE, type: Verify) {
78+
tasks.register('verifyMetalANGLE', Verify) {
79+
dependsOn fetchMetalANGLE
7980
src 'build/tmp/MetalANGLE.framework.ios.zip'
8081
algorithm 'SHA-256'
8182
checksum '9b6e7c82d41749266200ed19bb184c4f47df63c4dcde0972186ea557de623018'
8283
}
8384

84-
task verifyMetalANGLESimulator(dependsOn: fetchMetalANGLESimulator, type: Verify) {
85+
tasks.register('verifyMetalANGLESimulator', Verify) {
86+
dependsOn fetchMetalANGLESimulator
8587
src 'build/tmp/MetalANGLE.framework.ios.simulator.zip'
8688
algorithm 'SHA-256'
8789
checksum '63ff063bf7825e2da9a01eda981067eb4eacd42e202c86f448541d2c5bd564a9'
8890
}
8991

90-
task extractMetalANGLE(dependsOn: verifyMetalANGLE, type: Copy) {
92+
tasks.register('extractMetalANGLE', Copy) {
93+
dependsOn verifyMetalANGLE
9194
doFirst {
9295
file("build/tmp/real").mkdirs();
9396
}
9497
from zipTree('build/tmp/MetalANGLE.framework.ios.zip')
9598
into 'build/tmp/real'
9699
}
97100

98-
task extractMetalANGLESimulator(dependsOn: verifyMetalANGLESimulator, type: Copy) {
101+
tasks.register('extractMetalANGLESimulator', Copy) {
102+
dependsOn verifyMetalANGLESimulator
99103
doFirst {
100104
file("build/tmp/sim").mkdirs();
101105
}
102106
from zipTree('build/tmp/MetalANGLE.framework.ios.simulator.zip')
103107
into 'build/tmp/sim'
104108
}
105109

106-
task buildMetalANGLE(dependsOn: [
107-
extractMetalANGLE,
108-
extractMetalANGLESimulator
109-
], type: Exec) {
110+
tasks.register('buildMetalANGLE', Exec) {
111+
dependsOn extractMetalANGLE, extractMetalANGLESimulator
110112
doFirst {
111113
delete("res/META-INF/robovm/ios/libs/MetalANGLE.xcframework")
112114
file("res/META-INF/robovm/ios/libs").mkdirs();
@@ -122,14 +124,15 @@ task buildMetalANGLE(dependsOn: [
122124
outputs.dir 'res/META-INF/robovm/ios/libs/MetalANGLE.xcframework'
123125
}
124126

125-
task jnigenBuildIOS(dependsOn: buildMetalANGLE) {
127+
tasks.register('jnigenBuildIOS') {
128+
dependsOn buildMetalANGLE
126129
}
127130

128-
task jnigenBuild() {
131+
tasks.register('jnigenBuild') {
129132
}
130133

131134
//Dummy task to make compatible with publish
132-
task jnigen() {
135+
tasks.register('jnigen') {
133136
}
134137

135138
if(OperatingSystem.current() == OperatingSystem.MAC_OS) {

‎build.gradle

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -176,58 +176,60 @@ configure(subprojects - project(":backends") - project(":extensions") - project(
176176
}
177177
}
178178

179-
task setupExternalNativesDirs() {
179+
tasks.register('setupExternalNativesDirs') {
180180
doLast {
181181
file("build").mkdir();
182182
file("extensions/gdx-lwjgl3-angle/res").mkdirs();
183183
file("extensions/gdx-lwjgl3-glfw-awt-macos/res/macosx64").mkdirs();
184184
file("extensions/gdx-lwjgl3-glfw-awt-macos/res/macosarm64").mkdirs();
185185
}
186-
outputs.upToDateWhen { false }
186+
doNotTrackState("Don't track state")
187187
}
188188

189-
task fetchAngleNativesZIP(dependsOn: setupExternalNativesDirs, type: Download) {
189+
tasks.register('fetchAngleNativesZIP', Download) {
190+
dependsOn setupExternalNativesDirs
190191
src 'https://raw.githubusercontent.com/libgdx/gdx-angle-natives/master/gdx-angle-natives.zip'
191192
dest 'build/gdx-angle-natives.zip'
192193
onlyIfModified true
193194
useETag "all"
194195
}
195196

196-
task fetchGlfwAWT(dependsOn: setupExternalNativesDirs, type: Download) {
197+
tasks.register('fetchGlfwAWT', Download) {
198+
dependsOn setupExternalNativesDirs
197199
src 'https://raw.githubusercontent.com/badlogic/glfw/master/libglfw.dylib'
198200
dest 'extensions/gdx-lwjgl3-glfw-awt-macos/res/macosx64/libglfw.dylib'
199201
onlyIfModified true
200202
useETag "all"
201203
}
202204

203-
task fetchGlfwAWTARM64(dependsOn: setupExternalNativesDirs, type: Download) {
205+
tasks.register('fetchGlfwAWTARM64', Download) {
206+
dependsOn setupExternalNativesDirs
204207
src 'https://raw.githubusercontent.com/badlogic/glfw/master/libglfwarm64.dylib'
205208
dest 'extensions/gdx-lwjgl3-glfw-awt-macos/res/macosarm64/libglfwarm64.dylib'
206209
onlyIfModified true
207210
useETag "all"
208211
}
209212

210-
task fetchExternalNatives(dependsOn: [
211-
fetchAngleNativesZIP,
212-
fetchGlfwAWT,
213-
fetchGlfwAWTARM64
214-
] , type: Copy) {
213+
tasks.register('fetchExternalNatives', Copy) {
214+
dependsOn fetchAngleNativesZIP, fetchGlfwAWT, fetchGlfwAWTARM64
215215
from zipTree("build/gdx-angle-natives.zip")
216216
into "./extensions/gdx-lwjgl3-angle/res"
217-
outputs.upToDateWhen { false }
217+
doNotTrackState("Don't track state")
218218
}
219219

220-
task fetchGdxNativesZIP(dependsOn: fetchExternalNatives, type: Download) {
220+
tasks.register('fetchGdxNativesZIP', Download) {
221+
dependsOn fetchExternalNatives
221222
src "https://libgdx-nightlies.s3.eu-central-1.amazonaws.com/libgdx-nightlies/natives.zip"
222223
dest "build/natives.zip"
223224
onlyIfModified true
224225
useETag "all"
225226
}
226227

227-
task fetchNatives(dependsOn: fetchGdxNativesZIP, type: Copy) {
228+
tasks.register('fetchNatives', Copy) {
229+
dependsOn fetchGdxNativesZIP
228230
from zipTree("build/natives.zip")
229231
into "."
230-
outputs.upToDateWhen { false }
232+
doNotTrackState("Don't track state")
231233
}
232234

233235
apply from: rootProject.file('publish.gradle')

‎extensions/gdx-tools/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ ext {
3232
toolsAssetsDir = ["assets"]
3333
}
3434

35-
task dist2DParticles (type: Jar, dependsOn: configurations.runtimeClasspath) {
35+
tasks.register('dist2DParticles', Jar) {
36+
dependsOn configurations.runtimeClasspath
3637
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
3738

3839
from files(sourceSets.main.java.classesDirectory)
@@ -47,7 +48,8 @@ task dist2DParticles (type: Jar, dependsOn: configurations.runtimeClasspath) {
4748
}
4849
}
4950

50-
task dist3DParticles (type: Jar, dependsOn: configurations.runtimeClasspath) {
51+
tasks.register('dist3DParticles', Jar) {
52+
dependsOn configurations.runtimeClasspath
5153
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
5254

5355
from files(sourceSets.main.java.classesDirectory)
@@ -62,7 +64,8 @@ task dist3DParticles (type: Jar, dependsOn: configurations.runtimeClasspath) {
6264
}
6365
}
6466

65-
task distHiero (type: Jar, dependsOn: configurations.runtimeClasspath) {
67+
tasks.register('distHiero', Jar) {
68+
dependsOn configurations.runtimeClasspath
6669
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
6770

6871
from files(sourceSets.main.java.classesDirectory)
@@ -77,7 +80,8 @@ task distHiero (type: Jar, dependsOn: configurations.runtimeClasspath) {
7780
}
7881
}
7982

80-
task distTexturePacker (type: Jar, dependsOn: configurations.runtimeClasspath) {
83+
tasks.register('distTexturePacker', Jar) {
84+
dependsOn configurations.runtimeClasspath
8185
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
8286

8387
from files(sourceSets.main.java.classesDirectory)
@@ -92,12 +96,8 @@ task distTexturePacker (type: Jar, dependsOn: configurations.runtimeClasspath) {
9296
}
9397
}
9498

95-
task buildRunnables (dependsOn: [
96-
dist2DParticles,
97-
dist3DParticles,
98-
distHiero,
99-
distTexturePacker
100-
]) {
99+
tasks.register('buildRunnables') {
100+
dependsOn dist2DParticles, dist3DParticles, distHiero, distTexturePacker
101101
doLast {
102102
println "Building ye runnables"
103103
}

‎tests/gdx-tests-android/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ android {
8787
// called every time gradle gets executed, takes the native dependencies of
8888
// the natives configuration, and extracts them to the proper libs/ folders
8989
// so they get packed with the APK.
90-
task copyAndroidNatives() {
90+
tasks.register('copyAndroidNatives') {
9191
doFirst {
9292
file("libs/armeabi-v7a/").mkdirs();
9393
file("libs/arm64-v8a/").mkdirs();
@@ -116,8 +116,6 @@ task copyAndroidNatives() {
116116
}
117117
}
118118

119-
tasks.whenTaskAdded { packageTask ->
120-
if (packageTask.name.contains("merge") && packageTask.name.contains("JniLibFolders")) {
121-
packageTask.dependsOn 'copyAndroidNatives'
122-
}
119+
tasks.matching { it.name.contains("merge") && it.name.contains("JniLibFolders") }.configureEach { packageTask ->
120+
packageTask.dependsOn 'copyAndroidNatives'
123121
}

‎tests/gdx-tests-android/obb.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
task copyAssets {
1+
tasks.register('copyAssets') {
22
doLast {
33
def assets = fileTree('assets')
44
copy {
@@ -11,7 +11,7 @@ task copyAssets {
1111
}
1212
}
1313

14-
task zipAssets(type: Zip) {
14+
tasks.register('zipAssets', Zip) {
1515
destinationDirectory = file("build/obb")
1616
entryCompression = ZipEntryCompression.STORED
1717
from "build/obbassets"
@@ -40,11 +40,11 @@ def getADBPath() {
4040
adb
4141
}
4242

43-
task createOBBDir(type: Exec) {
43+
tasks.register('createOBBDir', Exec) {
4444
def adb = getADBPath()
4545
commandLine "$adb", 'shell', 'mkdir', '-p', '/mnt/sdcard/Android/obb/com.badlogic.gdx.tests.android'
4646
}
47-
task uploadOBB(type: Exec) {
47+
tasks.register('uploadOBB', Exec) {
4848
def adb = getADBPath()
4949
commandLine "$adb", 'push', 'build/obb/main.1.com.badlogic.gdx.tests.android.obb', '/mnt/sdcard/Android/obb/com.badlogic.gdx.tests.android'
5050
}

‎tests/gdx-tests-gwt/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ gwt {
5858
compiler.disableCastChecking = true
5959
}
6060

61-
task startHttpServer () {
61+
tasks.register('startHttpServer') {
6262
dependsOn draftCompileGwt
6363

6464
doFirst {
@@ -86,14 +86,15 @@ task beforeRun(type: AppBeforeIntegrationTestTask, dependsOn: startHttpServer) {
8686
interactive false
8787
}
8888

89-
task superDev (type: GwtSuperDev) {
89+
tasks.register('superDev', GwtSuperDev) {
9090
dependsOn startHttpServer
9191
doFirst {
9292
gwt.modules = gwt.devModules
9393
}
9494
}
9595

96-
task dist(dependsOn: [clean, compileGwt]) {
96+
tasks.register('dist') {
97+
dependsOn clean, compileGwt
9798
doLast {
9899
file("build/dist").mkdirs()
99100
copy {
@@ -112,7 +113,7 @@ task dist(dependsOn: [clean, compileGwt]) {
112113
}
113114

114115

115-
task addSource {
116+
tasks.register('addSource') {
116117
doLast {
117118
sourceSets.main.compileClasspath += files(project(':tests:gdx-tests').sourceSets.main.allJava.srcDirs)
118119
sourceSets.main.compileClasspath += files(project(':tests:gdx-tests').sourceSets.main.resources.srcDirs)

‎tests/gdx-tests-lwjgl/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ dependencies {
2525
implementation testnatives.desktop
2626
}
2727

28-
task launchTestsLwjgl (dependsOn: classes, type: JavaExec) {
28+
tasks.register('launchTestsLwjgl', JavaExec) {
29+
dependsOn classes
2930
mainClass = mainTestClass
3031
classpath = sourceSets.main.runtimeClasspath
3132
standardInput = System.in
@@ -36,7 +37,8 @@ configure (launchTestsLwjgl) {
3637
group "LibGDX"
3738
description = "Run the Lwjgl tests"
3839
}
39-
task dist(type: Jar, dependsOn: classes) {
40+
tasks.register('dist', Jar) {
41+
dependsOn classes
4042
manifest {
4143
attributes 'Main-Class': project.mainTestClass
4244
}

‎tests/gdx-tests-lwjgl3/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ dependencies {
3535
implementation testnatives.desktop
3636
}
3737

38-
task launchTestsLwjgl3 (dependsOn: classes, type: JavaExec) {
38+
tasks.register('launchTestsLwjgl3', JavaExec) {
39+
dependsOn classes
3940
mainClass = mainTestClass
4041
classpath = sourceSets.main.runtimeClasspath
4142
standardInput = System.in
@@ -46,7 +47,8 @@ configure (launchTestsLwjgl3) {
4647
group "LibGDX"
4748
description = "Run the Lwjgl3 tests"
4849
}
49-
task dist(type: Jar, dependsOn: classes) {
50+
tasks.register('dist', Jar) {
51+
dependsOn classes
5052
manifest {
5153
attributes 'Main-Class': project.mainTestClass
5254
}

0 commit comments

Comments
 (0)