From 1d1f205585471ab37ef955e9040925f645339deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Kr=C3=A1l?= <petr@inuits.eu>
Date: Fri, 23 Feb 2024 21:44:15 +0100
Subject: [PATCH] apply chages suggested in PR

---
 .../g/Gradle/Gradle-8.6-Java-17.eb            | 30 +++++++++++++++++++
 ...lide-Java-0.12.4-GCCcore-12.3.0-Java-17.eb |  6 ++--
 .../QuPath-0.5.0-GCCcore-12.3.0-Java-17.eb    | 14 ++++++---
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 easybuild/easyconfigs/g/Gradle/Gradle-8.6-Java-17.eb

diff --git a/easybuild/easyconfigs/g/Gradle/Gradle-8.6-Java-17.eb b/easybuild/easyconfigs/g/Gradle/Gradle-8.6-Java-17.eb
new file mode 100644
index 00000000000..01cb2993372
--- /dev/null
+++ b/easybuild/easyconfigs/g/Gradle/Gradle-8.6-Java-17.eb
@@ -0,0 +1,30 @@
+easyblock = 'PackedBinary'
+
+name = 'Gradle'
+version = '8.6'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'https://gradle.org'
+description = """Complete Gradle install.
+From mobile apps to microservices, from small startups to big enterprises,
+Gradle helps teams build, automate and deliver better software, faster.
+"""
+
+toolchain = SYSTEM
+
+source_urls = ['https://services.gradle.org/distributions']
+sources = ['gradle-%(version)s-all.zip']
+checksums = ['85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d']
+
+dependencies = [
+    ('Java', '17'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gradle'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
+
+sanity_check_commands = ['%(namelower)s --help']
diff --git a/easybuild/easyconfigs/o/OpenSlide-Java/OpenSlide-Java-0.12.4-GCCcore-12.3.0-Java-17.eb b/easybuild/easyconfigs/o/OpenSlide-Java/OpenSlide-Java-0.12.4-GCCcore-12.3.0-Java-17.eb
index f978519dab8..55957819d5f 100644
--- a/easybuild/easyconfigs/o/OpenSlide-Java/OpenSlide-Java-0.12.4-GCCcore-12.3.0-Java-17.eb
+++ b/easybuild/easyconfigs/o/OpenSlide-Java/OpenSlide-Java-0.12.4-GCCcore-12.3.0-Java-17.eb
@@ -14,7 +14,7 @@ sources = ['%(namelower)s-%(version)s.tar.xz']
 checksums = ['63a6cd63fedc7c700020708c0a362b3807b6780f0246b12c8dc372cecd6130cf']
 
 builddependencies = [
-    ('binutils', '2.40', '', SYSTEM),
+    ('binutils', '2.40'),
     ('ant', '1.10.12', versionsuffix, SYSTEM),
 ]
 
@@ -26,9 +26,9 @@ dependencies = [
 sanity_check_paths = {
     'files': [
         'lib/openslide-java/openslide.jar',
-        'lib/openslide-java/libopenslide-jni.so',
+        'lib/openslide-java/libopenslide-jni.%s' % SHLIB_EXT,
     ],
-    'dirs': []
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/q/QuPath/QuPath-0.5.0-GCCcore-12.3.0-Java-17.eb b/easybuild/easyconfigs/q/QuPath/QuPath-0.5.0-GCCcore-12.3.0-Java-17.eb
index 1225b8a1ba9..bed0ce4eb21 100644
--- a/easybuild/easyconfigs/q/QuPath/QuPath-0.5.0-GCCcore-12.3.0-Java-17.eb
+++ b/easybuild/easyconfigs/q/QuPath/QuPath-0.5.0-GCCcore-12.3.0-Java-17.eb
@@ -17,8 +17,8 @@ sources = ['v%(version)s.tar.gz']
 checksums = ['d244234ea2fd042488ca4a879f22103764dd3ed27cf9367a8293e50794023524']
 
 builddependencies = [
-    ('binutils', '2.40', '', SYSTEM),
-    ('Gradle', '8.6', '', SYSTEM),
+    ('binutils', '2.40'),
+    ('Gradle', '8.6', versionsuffix, SYSTEM),
 ]
 
 dependencies = [
@@ -36,8 +36,14 @@ files_to_copy = [
 modextrapaths = {'PATH': ['']}
 
 sanity_check_paths = {
-    'files': ['bin/%(name)s'],
-    'dirs': ['lib'],
+    'files': [
+        'bin/%(name)s',
+        'lib/libapplauncher.%s' % SHLIB_EXT,
+    ],
+    'dirs': [
+        'lib/app',
+        'lib/runtime',
+    ],
 }
 
 sanity_check_commands = ['%(name)s --help']