diff --git a/build.gradle b/build.gradle index e1d2c6d..63801ce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,17 @@ plugins { - id 'java-library' - id 'maven-publish' - // To manage included native libraries - alias(libs.plugins.javacpp) - // Need to use this instead (without version) if running as a QuPath subproject -// id 'org.bytedeco.gradle-javacpp-platform' + id 'java-library' + id 'maven-publish' + // To manage included native libraries + // Need to use this instead (without version) if running as a QuPath subproject + // id 'org.bytedeco.gradle-javacpp-platform' + id 'org.openjfx.javafxplugin' version '0.1.0' } ext.moduleName = 'qupath.extension.djl' ext.qupathVersion = gradle.ext.qupathVersion description = 'QuPath extension to use Deep Java Library' -version = "0.2.0" +version = "0.3.0" def djlVersion = libs.versions.deepJavaLibrary.get() @@ -19,15 +19,15 @@ repositories { // Use this only for local development! // mavenLocal() - mavenCentral() + mavenCentral() - maven { - url "https://maven.scijava.org/content/repositories/releases" + maven { + url "https://maven.scijava.org/content/repositories/releases" } - maven { - url "https://maven.scijava.org/content/repositories/snapshots" - } + maven { + url "https://maven.scijava.org/content/repositories/snapshots" + } } @@ -47,9 +47,9 @@ dependencies { } processResources { - from ("${projectDir}/LICENSE") { - into 'META-INF/licenses/' - } + from ("${projectDir}/LICENSE") { + into 'META-INF/licenses/' + } } tasks.register("copyDependencies", Copy) { @@ -65,12 +65,12 @@ tasks.register("copyDependencies", Copy) { */ java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } if (project.properties['sources']) - withSourcesJar() + withSourcesJar() if (project.properties['javadocs']) - withJavadocJar() + withJavadocJar() } @@ -78,17 +78,17 @@ java { * Set encoding */ tasks.named('compileJava') { - options.encoding = 'UTF-8' + options.encoding = 'UTF-8' } /* * Manifest info */ jar { - manifest { - attributes("Implementation-Title": project.name, + manifest { + attributes("Implementation-Title": project.name, "Implementation-Version": archiveVersion, - "Automatic-Module-Name": "io.github." + moduleName) + "Automatic-Module-Name": "io.github." + moduleName) } } @@ -97,11 +97,11 @@ jar { * Use -PstrictJavadoc=true to fail on error with doclint (which is rather strict). */ tasks.withType(Javadoc) { - options.encoding = 'UTF-8' - def strictJavadoc = findProperty('strictJavadoc') - if (!strictJavadoc) { + options.encoding = 'UTF-8' + def strictJavadoc = findProperty('strictJavadoc') + if (!strictJavadoc) { options.addStringOption('Xdoclint:none', '-quiet') - } + } } /* @@ -118,33 +118,33 @@ tasks.named('test') { publishing { - repositories { - maven { - name = "SciJava" - def releasesRepoUrl = uri("https://maven.scijava.org/content/repositories/releases") - def snapshotsRepoUrl = uri("https://maven.scijava.org/content/repositories/snapshots") - // Use gradle -Prelease publish - url = project.hasProperty('release') ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username = System.getenv("MAVEN_USER") - password = System.getenv("MAVEN_PASS") - } - } - } + repositories { + maven { + name = "SciJava" + def releasesRepoUrl = uri("https://maven.scijava.org/content/repositories/releases") + def snapshotsRepoUrl = uri("https://maven.scijava.org/content/repositories/snapshots") + // Use gradle -Prelease publish + url = project.hasProperty('release') ? releasesRepoUrl : snapshotsRepoUrl + credentials { + username = System.getenv("MAVEN_USER") + password = System.getenv("MAVEN_PASS") + } + } + } - publications { - mavenJava(MavenPublication) { - groupId = 'io.github.qupath' - from components.java - - pom { - licenses { - license { - name = 'Apache License v2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0' - } - } - } - } - } -} \ No newline at end of file + publications { + mavenJava(MavenPublication) { + groupId = 'io.github.qupath' + from components.java + + pom { + licenses { + license { + name = 'Apache License v2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0' + } + } + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal