From 704519709d77d95cac3e5d3d72f141d96feb58e4 Mon Sep 17 00:00:00 2001 From: Benjamin Deroche Date: Fri, 2 Aug 2024 15:23:15 +0200 Subject: [PATCH] Regenerate from zproject --- bindings/jni/czmq-jni-native/build.gradle | 2 +- bindings/jni/czmq-jni/build.gradle | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bindings/jni/czmq-jni-native/build.gradle b/bindings/jni/czmq-jni-native/build.gradle index 0dd42a527..f6b4f71f6 100644 --- a/bindings/jni/czmq-jni-native/build.gradle +++ b/bindings/jni/czmq-jni-native/build.gradle @@ -12,7 +12,7 @@ dependencies { // ------------------------------------------------------------------ // Build section -tasks.register('copyLibs', type: Copy) { +tasks.register('copyLibs', Copy) { def libraryPaths = [] if (project.hasProperty('buildPrefix')) { if (osdetector.os == 'windows') { diff --git a/bindings/jni/czmq-jni/build.gradle b/bindings/jni/czmq-jni/build.gradle index dc9fca400..4bba8375a 100644 --- a/bindings/jni/czmq-jni/build.gradle +++ b/bindings/jni/czmq-jni/build.gradle @@ -19,7 +19,8 @@ dependencies { // ------------------------------------------------------------------ // Build section -tasks.register('generateJniHeaders', type: Exec, dependsOn: 'classes') { +tasks.register('generateJniHeaders', Exec) { + dependsOn 'classes' def classpath = sourceSets.main.output.classesDirs def appclasspath = configurations.runtimeClasspath.files*.getAbsolutePath().join(File.pathSeparator) def nativeIncludes = 'src/native/include' @@ -81,13 +82,15 @@ tasks.withType(Test).configureEach { } } -tasks.register('initCMake', type: Exec, dependsOn: 'generateJniHeaders') { +tasks.register('initCMake', Exec) { + dependsOn 'generateJniHeaders' workingDir 'build' def prefixPath = hasNotEmptyProperty('buildPrefix') ? "-DCMAKE_PREFIX_PATH=$project.buildPrefix" : '' commandLine 'cmake', "$prefixPath", '..' } -tasks.register('buildNative', type: Exec, dependsOn: 'initCMake') { +tasks.register('buildNative', Exec) { + dependsOn 'initCMake' if (osdetector.os == 'windows') { commandLine 'cmake', '--build', 'build', @@ -106,12 +109,14 @@ test.dependsOn buildNative // ------------------------------------------------------------------ // Install and Publish section -tasks.register('sourcesJar', type: Jar, dependsOn: 'classes') { +tasks.register('sourcesJar', Jar) { + dependsOn 'classes' archiveClassifier = 'sources' from sourceSets.main.allSource } -tasks.register('javadocJar', type: Jar, dependsOn: 'javadoc') { +tasks.register('javadocJar', Jar) { + dependsOn 'javadoc' archiveClassifier = 'javadoc' from javadoc.destinationDir }