From 69d27d3d838a71f28ed93869d4f6d8b812927534 Mon Sep 17 00:00:00 2001
From: lleplat <lleplat@ed.ac.uk>
Date: Fri, 15 Nov 2024 10:13:10 +0000
Subject: [PATCH] Typos

---
 build.gradle.kts    | 32 ++++++++++++++++----------------
 settings.gradle.kts |  5 +----
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3d8073e..b6b5eaf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,16 +10,16 @@ plugins {
     id("org.bytedeco.gradle-javacpp-platform")
 }
 
-val moduleName = "qupath.extension.omero"
+extra["moduleName"] = "qupath.extension.omero"
 version = "0.1.1-rc1"
 description = "QuPath extension to support image reading using OMERO APIs."
 group = "io.github.qupath"
-val qupathVersion = "0.6.0-rc1"
+extra["qupathVersion"] = gradle.extra["qupathVersion"]
 extra["qupathJavaVersion"] = libs.versions.jdk.get()
 
 dependencies {
-    shadow("io.github.qupath:qupath-gui-fx:${qupathVersion}")
-    shadow("io.github.qupath:qupath-extension-bioformats:${qupathVersion}")
+    shadow("io.github.qupath:qupath-gui-fx:${project.extra["qupathVersion"]}")
+    shadow("io.github.qupath:qupath-extension-bioformats:${project.extra["qupathVersion"]}")
     shadow(libs.qupath.fxtras)
     shadow(libs.guava)
 
@@ -28,8 +28,8 @@ dependencies {
     // Auto-discover if OMERO-Gateway is available
     shadow("org.openmicroscopy:omero-gateway:5.8.2")
 
-    testImplementation("io.github.qupath:qupath-gui-fx:${qupathVersion}")
-    testImplementation("io.github.qupath:qupath-extension-bioformats:${qupathVersion}")
+    testImplementation("io.github.qupath:qupath-gui-fx:${project.extra["qupathVersion"]}")
+    testImplementation("io.github.qupath:qupath-extension-bioformats:${project.extra["qupathVersion"]}")
     testImplementation("org.openmicroscopy:omero-gateway:5.8.2")
     testImplementation(libs.junit)
     testImplementation("org.testcontainers:testcontainers:1.19.1")
@@ -41,11 +41,19 @@ tasks.withType<Jar> {
         attributes(mapOf(
                 "Implementation-Title" to project.name,
                 "Implementation-Version" to archiveVersion,
-                "Automatic-Module-Name" to moduleName
+                "Automatic-Module-Name" to project.extra["moduleName"]
         ))
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(project.extra["qupathJavaVersion"] as String))
+    }
+    withSourcesJar()
+    withJavadocJar()
+}
+
 /**
  * Copy necessary attributes, see
  * - https://github.com/qupath/qupath-extension-template/issues/9
@@ -54,7 +62,7 @@ tasks.withType<Jar> {
 configurations.shadow {
     val runtimeAttributes = configurations.runtimeClasspath.get().attributes
     runtimeAttributes.keySet().forEach { key ->
-        attributes.attribute(key as Attribute<Any>, runtimeAttributes.getAttribute(key))
+        attributes.attribute(key as Attribute<Any>, runtimeAttributes.getAttribute(key) as Any)
     }
 }
 
@@ -72,14 +80,6 @@ tasks.register<Copy>("copyDependencies") {
     into("build/libs")
 }
 
-java {
-    toolchain {
-        //languageVersion.set(JavaLanguageVersion.of(extra["qupathJavaVersion"] as String))
-    }
-    withSourcesJar()
-    withJavadocJar()
-}
-
 tasks.withType<Javadoc> {
     options.encoding = "UTF-8"
     if (findProperty("strictJavadoc") == null) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f9332b0..939d3e0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,14 +6,11 @@ pluginManagement {
 
 rootProject.name = "qupath-extension-omero"
 
-gradle.extra["qupathVersion"] = "0.6.0-SNAPSHOT"
+extra["qupathVersion"] = "0.6.0-SNAPSHOT"
 
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-
-        }
-        libs {
             from("io.github.qupath:qupath-catalog:${extra["qupathVersion"]}")
         }
     }