Skip to content

Commit 70de31e

Browse files
committed
Problem: Last second code cleanup led to use of non existing syntax
Solution: Yet another commit
1 parent b8ab17b commit 70de31e

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

zproject_java.gsl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ dependencies {
207207
// ------------------------------------------------------------------
208208
// Build section
209209

210-
tasks.register('generateJniHeaders', type: Exec, dependsOn: 'classes') {
210+
tasks.register('generateJniHeaders', Exec) {
211+
dependsOn 'classes'
211212
def classpath = sourceSets.main.output.classesDirs
212213
def appclasspath = configurations.runtimeClasspath.files*.getAbsolutePath().join(File.pathSeparator)
213214
def nativeIncludes = 'src/native/include'
@@ -240,13 +241,15 @@ tasks.withType(Test).configureEach {
240241
}
241242
}
242243

243-
tasks.register('initCMake', type: Exec, dependsOn: 'generateJniHeaders') {
244+
tasks.register('initCMake', Exec) {
245+
dependsOn 'generateJniHeaders'
244246
workingDir 'build'
245247
def prefixPath = hasNotEmptyProperty('buildPrefix') ? "-DCMAKE_PREFIX_PATH=$project.buildPrefix" : ''
246248
commandLine 'cmake', "$prefixPath", '..'
247249
}
248250

249-
tasks.register('buildNative', type: Exec, dependsOn: 'initCMake') {
251+
tasks.register('buildNative', Exec) {
252+
dependsOn 'initCMake'
250253
if (osdetector.os == 'windows') {
251254
commandLine 'cmake',
252255
'--build', 'build',
@@ -265,12 +268,14 @@ test.dependsOn buildNative
265268
// ------------------------------------------------------------------
266269
// Install and Publish section
267270

268-
tasks.register('sourcesJar', type: Jar, dependsOn: 'classes') {
271+
tasks.register('sourcesJar', Jar) {
272+
dependsOn 'classes'
269273
archiveClassifier = 'sources'
270274
from sourceSets.main.allSource
271275
}
272276

273-
tasks.register('javadocJar', type: Jar, dependsOn: 'javadoc') {
277+
tasks.register('javadocJar', Jar) {
278+
dependsOn 'javadoc'
274279
archiveClassifier = 'javadoc'
275280
from javadoc.destinationDir
276281
}
@@ -437,7 +442,7 @@ dependencies {
437442
// ------------------------------------------------------------------
438443
// Build section
439444

440-
tasks.register('copyLibs', type: Copy) {
445+
tasks.register('copyLibs', Copy) {
441446
def libraryPaths = []
442447
if (project.hasProperty('buildPrefix')) {
443448
if (osdetector.os == 'windows') {

0 commit comments

Comments
 (0)