Use modularized and JPMS-compliant Eclipse Collections libraries

JPro-one · Oct 18, 2024 · 0570f0e · 0570f0e
1 parent 825efdd
commit 0570f0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ AUTH0_JAVAJWT_VERSION = 4.4.0
 AUTH0_JWKSRSA_VERSION = 0.22.1-jpms
 JAKARTA_MAIL_API_VERSION = 2.1.3
 ECLIPSE_ANGUS_MAIL_VERSION = 2.0.3
-ECLIPSE_COLLECTIONS_VERSION = 11.1.0
+ECLIPSE_COLLECTIONS_VERSION = 11.1.0-jpms
 CSSFX_VERSION = 11.5.1-jpms
 IKONLI_VERSION = 12.3.1
 ATLANTAFX_VERSION = 2.0.1

diff --git a/jpro-mail/build.gradle b/jpro-mail/build.gradle
@@ -2,8 +2,8 @@ dependencies {
     implementation "jakarta.mail:jakarta.mail-api:$JAKARTA_MAIL_API_VERSION"
     runtimeOnly "org.eclipse.angus:angus-mail:$ECLIPSE_ANGUS_MAIL_VERSION"
     implementation "org.jetbrains:annotations:$JETBRAINS_ANNOTATIONS_VERSION"
-    api "org.eclipse.collections:eclipse-collections-api:$ECLIPSE_COLLECTIONS_VERSION"
-    implementation "org.eclipse.collections:eclipse-collections:$ECLIPSE_COLLECTIONS_VERSION"
+    api "one.jpro.platform.jpms:eclipse-collections-api:$ECLIPSE_COLLECTIONS_VERSION"
+    implementation "one.jpro.platform.jpms:eclipse-collections:$ECLIPSE_COLLECTIONS_VERSION"
     api "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
 }
 

diff --git a/jpro-mail/src/main/java/module-info.java b/jpro-mail/src/main/java/module-info.java
@@ -8,8 +8,8 @@
     requires transitive org.eclipse.collections.api;
 
     requires jakarta.mail;
+    requires org.eclipse.collections;
     requires org.jetbrains.annotations;
-    requires org.eclipse.collections.impl;
 
     exports one.jpro.platform.mail;
     exports one.jpro.platform.mail.config;