From d5ab4c973876e6194dbddd893c6f32c6a53b7a90 Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Thu, 22 Feb 2024 16:03:18 -0600
Subject: [PATCH] build: Remove modularity plugin

---
 apps/sampler-javafx/sampler-javafx.gradle |  2 +-
 build.gradle                              |  2 --
 gradle.properties                         |  1 -
 settings.gradle                           | 13 ++++++-------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/sampler-javafx/sampler-javafx.gradle b/apps/sampler-javafx/sampler-javafx.gradle
index 7963fc87..eb762716 100644
--- a/apps/sampler-javafx/sampler-javafx.gradle
+++ b/apps/sampler-javafx/sampler-javafx.gradle
@@ -21,7 +21,7 @@ plugins {
 
 application {
   mainModule = 'org.kordamp.ikonli.sampler.javafx'
-  mainClass  = 'org.kordamp.ikonli.sampler.javafx.Sample'
+  mainClass  = 'org.kordamp.ikonli.sampler.javafx.Sampler'
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index d9e5d515..59379f40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,6 @@
  */
 plugins {
     id 'com.google.osdetector'
-    id 'org.javamodularity.moduleplugin' apply false
 }
 
 ext.javafx_platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
@@ -79,7 +78,6 @@ idea {
 subprojects { subproj ->
     if (!subproj.name.contains('guide') && !subproj.name.contains('bom')) {
         apply plugin: 'java-library'
-        apply plugin: 'org.javamodularity.moduleplugin'
 
         dependencies {
             testImplementation 'junit:junit:4.13.2'
diff --git a/gradle.properties b/gradle.properties
index 0906875e..c294c307 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,6 @@ osPluginVersion         = 1.7.0
 kordampPluginVersion    = 0.54.0
 kordampBuildVersion     = 3.4.0
 gitPluginVersion        = 3.0.0
-modularityPluginVersion = 1.8.10
 jlinkPluginVersion      = 2.24.4
 jreleaserPluginVersion  = 1.10.0
 miglayoutVersion        = 11.0
diff --git a/settings.gradle b/settings.gradle
index 4ff1613d..a35500c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,13 +22,12 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'org.kordamp.gradle.guide'        version kordampPluginVersion
-        id 'org.kordamp.gradle.bom'          version kordampPluginVersion
-        id 'org.ajoberstar.git-publish'      version gitPluginVersion
-        id 'com.google.osdetector'           version osPluginVersion
-        id 'org.javamodularity.moduleplugin' version modularityPluginVersion
-        id 'org.beryx.jlink'                 version jlinkPluginVersion
-        id 'org.jreleaser.jdks'              version jreleaserPluginVersion
+        id 'org.kordamp.gradle.guide'   version kordampPluginVersion
+        id 'org.kordamp.gradle.bom'     version kordampPluginVersion
+        id 'org.ajoberstar.git-publish' version gitPluginVersion
+        id 'com.google.osdetector'      version osPluginVersion
+        id 'org.beryx.jlink'            version jlinkPluginVersion
+        id 'org.jreleaser.jdks'         version jreleaserPluginVersion
     }
 }