Update module settings

kordamp · Nov 8, 2020 · 37f50ad · 37f50ad
1 parent bd1c9c3
commit 37f50ad
Show file tree

Hide file tree

Showing 63 changed files with 140 additions and 77 deletions.
diff --git a/apps/sampler-javafx/sampler-javafx.gradle b/apps/sampler-javafx/sampler-javafx.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'application'
 }
 
-mainClassName = 'org.kordamp.ikonli.sampler.javafx.Sampler'
+mainClassName = 'org.kordamp.ikonli.sampler.javafx/org.kordamp.ikonli.sampler.javafx.Sampler'
 
 dependencies {
     implementation project(':ikonli-core')

diff --git a/apps/sampler-javafx/src/main/java/module-info.java b/apps/sampler-javafx/src/main/java/module-info.java
@@ -15,7 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-open module org.kordamp.ikonli.sampler.javafx {
+module org.kordamp.ikonli.sampler.javafx {
+    opens org.kordamp.ikonli.sampler.javafx;
     requires javafx.base;
     requires javafx.graphics;
     requires javafx.controls;

diff --git a/apps/sampler-swing/sampler-swing.gradle b/apps/sampler-swing/sampler-swing.gradle
@@ -17,7 +17,7 @@
  */
 apply plugin: 'application'
 
-mainClassName = 'org.kordamp.ikonli.sampler.swing.Sampler'
+mainClassName = 'org.kordamp.ikonli.sampler.swing/org.kordamp.ikonli.sampler.swing.Sampler'
 
 dependencies {
     implementation project(':ikonli-core')

diff --git a/apps/sampler-swing/src/main/java/module-info.java b/apps/sampler-swing/src/main/java/module-info.java
@@ -15,7 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-open module org.kordamp.ikonli.sampler.swing {
+module org.kordamp.ikonli.sampler.swing {
+    opens org.kordamp.ikonli.sampler.swing;
     requires java.desktop;
     requires org.kordamp.ikonli.core;
     requires org.kordamp.ikonli.swing;

diff --git a/core/ikonli-core/src/main/java/module-info.java b/core/ikonli-core/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.core {
     exports org.kordamp.ikonli;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     requires java.logging;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/core/ikonli-javafx/src/main/java/module-info.java b/core/ikonli-javafx/src/main/java/module-info.java
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 module org.kordamp.ikonli.javafx {
-    requires org.kordamp.ikonli.core;
-    uses org.kordamp.ikonli.IkonHandler;
     exports org.kordamp.ikonli.javafx;
 
+    requires org.kordamp.ikonli.core;
+
     requires javafx.base;
     requires javafx.graphics;
     requires javafx.controls;
+
+    uses org.kordamp.ikonli.IkonHandler;
 }
diff --git a/gradle.properties b/gradle.properties
@@ -16,76 +16,78 @@
 # limitations under the License.
 #
 
-ikonliJdk8Version      = 2.6.0
-version                = 12.0.0-SNAPSHOT
-group                  = org.kordamp.ikonli
+ikonliJdk8Version       = 2.6.0
+version                 = 12.0.0-SNAPSHOT
+group                   = org.kordamp.ikonli
 
-sourceCompatibility    = 11
-javafxVersion          = 11
-jipsyVersion           = 0.6.0
-jacocoVersion          = 0.8.6
+sourceCompatibility     = 11
+javafxVersion           = 11
+jipsyVersion            = 0.6.0
+jacocoVersion           = 0.8.6
 
-osPluginVersion        = 1.6.2
-kordampPluginVersion   = 0.41.0
-kordampBuildVersion    = 2.0.0
-gitPluginVersion       = 3.0.0
+osPluginVersion         = 1.6.2
+kordampPluginVersion    = 0.41.0
+kordampBuildVersion     = 2.0.0
+gitPluginVersion        = 3.0.0
+modularityPluginVersion = 1.7.0
+java9cPluginVersion     = 0.2.3
 
-antdesigniconsVersion  = 4.0.0
-boxiconsVersion        = 2.0.7
-bpmnVersion            = 0.10.0
-captainiconVersion     = 20140501
-carboniconsVersion     = 10.23.2
-codiconsVersion        = 0.0.12
-coreuiVersion          = 2.0.0-beta.5
-dashiconsVersion       = 20200504
-deviconsVersion        = 1.8.0
-elusiveVersion         = 2.0
-entypoVersion          = 1.0
-evaiconsVersion        = 1.1.3
-featherVersion         = 4.28
-fileiconsVersion       = 2.1.44
-fluentuiVersion        = 1.1.74
-fontawesomeVersion     = 4.7.0
-fontawesome5Version    = 5.15.1
-fontelicoVersion       = 0.0
-foundationVersion      = 3.0
-hawconsVersion         = 20140708
-ioniconsVersion        = 2.0.1
-ionicons4Version       = 4.1.2
-icomoonVersion         = 0.0
-jamiconsVersion        = 3.0.0
-lineawesomeVersion     = 1.3.0
-lineconsVersion        = 0.0
-ligaturesymbolsVersion = 2.11
-makiVersion            = 0.5.0
-maki2Version           = 6.2.0
-mapiconsVersion        = 3.0.0
-materialVersion        = 50
-material2Version       = 20200820
-materialdesignVersion  = 1.7.22
-materialdesign2Version = 5.8.55
-mediconsVersion        = 20170612
-metrizeiconsVersion    = 0.0
-micronsVersion         = 1.0.8
-ociiconsVersion        = 1.0
-octiconsVersion        = 11.0.0
-openiconicVersion      = 1.1.0
-paymentfontVersion     = 1.2.5
-prestashopiconsVersion = 0.8.0
-remixiconVersion       = 2.5.0
-runestroiconsVersion   = 5.6
-simpleiconsVersion     = 3.12.2
-simplelineiconsVersion = 2.5.4
-subwayVersion          = 20201108
-typiconsVersion        = 2.0.7
-themifyVersion         = 1.0.1
-uniconsVersion         = 20201106
-weathericonsVersion    = 2.0.10
-websymbolsVersion      = 0.0
-whhgVersion            = 20201105
-win10Version           = 1.0.1
-zondiconsVersion       = 20170712
+antdesigniconsVersion   = 4.0.0
+boxiconsVersion         = 2.0.7
+bpmnVersion             = 0.10.0
+captainiconVersion      = 20140501
+carboniconsVersion      = 10.23.2
+codiconsVersion         = 0.0.12
+coreuiVersion           = 2.0.0-beta.5
+dashiconsVersion        = 20200504
+deviconsVersion         = 1.8.0
+elusiveVersion          = 2.0
+entypoVersion           = 1.0
+evaiconsVersion         = 1.1.3
+featherVersion          = 4.28
+fileiconsVersion        = 2.1.44
+fluentuiVersion         = 1.1.74
+fontawesomeVersion      = 4.7.0
+fontawesome5Version     = 5.15.1
+fontelicoVersion        = 0.0
+foundationVersion       = 3.0
+hawconsVersion          = 20140708
+ioniconsVersion         = 2.0.1
+ionicons4Version        = 4.1.2
+icomoonVersion          = 0.0
+jamiconsVersion         = 3.0.0
+lineawesomeVersion      = 1.3.0
+lineconsVersion         = 0.0
+ligaturesymbolsVersion  = 2.11
+makiVersion             = 0.5.0
+maki2Version            = 6.2.0
+mapiconsVersion         = 3.0.0
+materialVersion         = 50
+material2Version        = 20200820
+materialdesignVersion   = 1.7.22
+materialdesign2Version  = 5.8.55
+mediconsVersion         = 20170612
+metrizeiconsVersion     = 0.0
+micronsVersion          = 1.0.8
+ociiconsVersion         = 1.0
+octiconsVersion         = 11.0.0
+openiconicVersion       = 1.1.0
+paymentfontVersion      = 1.2.5
+prestashopiconsVersion  = 0.8.0
+remixiconVersion        = 2.5.0
+runestroiconsVersion    = 5.6
+simpleiconsVersion      = 3.12.2
+simplelineiconsVersion  = 2.5.4
+subwayVersion           = 20201108
+typiconsVersion         = 2.0.7
+themifyVersion          = 1.0.1
+uniconsVersion          = 20201106
+weathericonsVersion     = 2.0.10
+websymbolsVersion       = 0.0
+whhgVersion             = 20201105
+win10Version            = 1.0.1
+zondiconsVersion        = 20170712
 
-org.gradle.daemon      = true
-org.gradle.caching     = true
-org.gradle.parallel    = false
+org.gradle.daemon       = true
+org.gradle.caching      = true
+org.gradle.parallel     = false
diff --git a/icon-packs/ikonli-antdesignicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-antdesignicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.antdesignicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.antdesignicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-boxicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.boxicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.boxicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-bpmn-pack/src/main/java/module-info.java b/icon-packs/ikonli-bpmn-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.bpmn {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.bpmn;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-captainicon-pack/src/main/java/module-info.java b/icon-packs/ikonli-captainicon-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.captainicon {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.captainicon;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-carbonicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-carbonicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.carbonicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.carbonicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-codicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-codicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.codicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.codicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-coreui-pack/src/main/java/module-info.java b/icon-packs/ikonli-coreui-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.coreui {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.coreui;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-dashicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-dashicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.dashicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.dashicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-devicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-devicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.devicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.devicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-elusive-pack/src/main/java/module-info.java b/icon-packs/ikonli-elusive-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.elusive {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.elusive;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-entypo-pack/src/main/java/module-info.java b/icon-packs/ikonli-entypo-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.entypo {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.entypo;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-evaicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-evaicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.evaicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.evaicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-feather-pack/src/main/java/module-info.java b/icon-packs/ikonli-feather-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.feather {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.feather;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-fileicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-fileicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.fileicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.fileicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-fluentui-pack/src/main/java/module-info.java b/icon-packs/ikonli-fluentui-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.fluentui {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.fluentui;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-fontawesome-pack/src/main/java/module-info.java b/icon-packs/ikonli-fontawesome-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.fontawesome {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.fontawesome;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-fontawesome5-pack/src/main/java/module-info.java b/icon-packs/ikonli-fontawesome5-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.fontawesome5 {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.fontawesome5;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-fontelico-pack/src/main/java/module-info.java b/icon-packs/ikonli-fontelico-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.fontelico {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.fontelico;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-foundation-pack/src/main/java/module-info.java b/icon-packs/ikonli-foundation-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.foundation {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.foundation;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-hawcons-pack/src/main/java/module-info.java b/icon-packs/ikonli-hawcons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.hawcons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.hawcons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-icomoon-pack/src/main/java/module-info.java b/icon-packs/ikonli-icomoon-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.icomoon {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.icomoon;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-ionicons-pack/src/main/java/module-info.java b/icon-packs/ikonli-ionicons-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.ionicons {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.ionicons;
 
     provides org.kordamp.ikonli.IkonHandler

diff --git a/icon-packs/ikonli-ionicons4-pack/src/main/java/module-info.java b/icon-packs/ikonli-ionicons4-pack/src/main/java/module-info.java
@@ -18,6 +18,7 @@
 module org.kordamp.ikonli.ionicons4 {
     requires org.kordamp.ikonli.core;
     requires static org.kordamp.jipsy;
+    requires static org.kordamp.jipsy.annotations;
     exports org.kordamp.ikonli.ionicons4;
 
     provides org.kordamp.ikonli.IkonHandler