Merge pull request #6 from petebankhead/toolchains

Support toolchain gradle or system property

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 base {
     group = "io.github.qupath"
-    version = "0.2.0"
+    version = "0.2.1-SNAPSHOT"
     description = "Gradle plugin for developing QuPath extensions"
 }
 

src/main/kotlin/qupath-conventions.gradle.kts

@@ -108,7 +108,8 @@ tasks.register<Copy>("copyDependencies") {
  * Ensure we include sources and javadocs when building.
  */
 java {
-    val jdkVersion = findRequiredVersionInCatalog("jdk")
+    // Java typically added
+    var jdkVersion = findToolchainVersion()
     if (!jdkVersion.isNullOrEmpty()) {
         toolchain {
             languageVersion = JavaLanguageVersion.of(jdkVersion)
@@ -118,6 +119,26 @@ java {
     withJavadocJar()
 }
 
+/**
+ * Work out which Java version to use for the build
+ */
+fun findToolchainVersion(): String? {
+    // Try Gradle property
+    var toolchainVersion = providers.gradleProperty("toolchain").orNull
+    if (!toolchainVersion.isNullOrEmpty()) {
+        println("Using toolchain version $toolchainVersion from gradle property")
+        return toolchainVersion
+    }
+    // Try System property
+    toolchainVersion = System.getProperty("toolchain")
+    if (!toolchainVersion.isNullOrEmpty()) {
+        println("Using toolchain version $toolchainVersion from system property")
+        return toolchainVersion
+    }
+    // Default to version catalog
+    return findRequiredVersionInCatalog("jdk")
+}
+
 /*
  * Set the JavaFX version if we can find it in a version catalog,
  * and include the 'standard' modules required by QuPath.