Merge pull request #6 from petebankhead/update-build

Update build script

.github/workflows/build_jar.yml

@@ -9,16 +9,16 @@
    build:
      runs-on: ubuntu-latest
      steps:
-     - uses: actions/checkout@v2
-     - name: Set up JDK 11
-       uses: actions/setup-java@v2
+     - uses: actions/checkout@v4
+     - name: Set up JDK 17
+       uses: actions/setup-java@v4
        with:
-         java-version: '11'
-         distribution: 'adopt-hotspot'
+         java-version: '17'
+         distribution: 'temurin'
      - name: Grant execute permission for gradlew
        run: chmod +x gradlew
      - name: Build with Gradle
-       run: ./gradlew shadowJar -P toolchain=11
+       run: ./gradlew shadowJar -P toolchain=17
      - uses: actions/upload-artifact@v2
        with:
          name: libs

.github/workflows/gradle.yml

@@ -9,13 +9,13 @@
    build:
      runs-on: ubuntu-latest
      steps:
-     - uses: actions/checkout@v2
-     - name: Set up JDK 11
-       uses: actions/setup-java@v2
+     - uses: actions/checkout@v4
+     - name: Set up JDK 17
+       uses: actions/setup-java@v4
        with:
-         java-version: '11'
-         distribution: 'adopt-hotspot'
+         java-version: '17'
+         distribution: 'temurin'
      - name: Grant execute permission for gradlew
        run: chmod +x gradlew
      - name: Build with Gradle
-       run: ./gradlew build -P toolchain=11
+       run: ./gradlew build -P toolchain=17

build.gradle.kts

@@ -0,0 +1,53 @@
+plugins {
+	// Important to add shadow plugin first
+	id("com.gradleup.shadow") version "8.3.5"
+	id("qupath-conventions")
+}
+
+qupathExtension {
+	name = "qupath-extension-jpen"
+	version = "0.4.0-SNAPSHOT"
+	group = "io.github.qupath"
+	description = "QuPath extension to support graphic tablet input using JPen"
+	automaticModule = "qupath.extension.jpen"
+}
+
+val libName = "jpen-2.0.0"
+val libZipped = file("libs/${libName}-lib.zip")
+val libUnzipped = project.layout.buildDirectory.file("unpacked/")
+
+tasks.register<Copy>("extractLibs") {
+	description = "Extract JPen library (required before building)"
+	group = "QuPath"
+
+	from(zipTree(libZipped))
+	into(libUnzipped)
+}
+
+tasks.compileJava.configure {
+	dependsOn("extractLibs")
+}
+
+tasks.shadowJar {
+	from(project.layout.buildDirectory.file("unpacked/${libName}")) {
+		into("natives/")
+
+		include("'*.dll")
+		include("*.jnilib")
+		include("*.so")
+	}
+}
+
+dependencies {
+
+	implementation(fileTree(project.layout.buildDirectory.file("unpacked/${libName}")) { include("jpen-2.jar") })
+
+	shadow(libs.bundles.qupath)
+	shadow(libs.bundles.logging)
+
+	// For testing
+	testImplementation(libs.bundles.qupath)
+	testImplementation(libs.junit)
+
+}
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ 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
+        # shellcheck disable=SC2039,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
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle.kts

@@ -0,0 +1,17 @@
+pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		maven {
+			url = uri("https://maven.scijava.org/content/repositories/releases")
+		}
+	}
+}
+
+qupath {
+	version = "0.5.0"
+}
+
+// Apply QuPath Gradle settings plugin to handle configuration
+plugins {
+	id("io.github.qupath.qupath-extension-settings") version "0.2.1"
+}