From e83ac4b241a95b127a4115542be613aa53ca48c1 Mon Sep 17 00:00:00 2001 From: Carlos Amengual Date: Fri, 12 Jul 2024 18:38:55 +0200 Subject: [PATCH] Gradle: use `implementation` instead of `api` in several places Using `implementation` is generally a bad idea, however there are specific places where it could be convenient to have (like when importing i18n). Some module-info files were reformatted but otherwise not modified. --- echosvg-all/src/main/java/module-info.java | 5 +++-- echosvg-anim/src/main/java/module-info.java | 6 ++++-- echosvg-awt-util/build.gradle | 1 + .../src/main/java/module-info.java | 4 +++- echosvg-bridge/build.gradle | 2 +- echosvg-bridge/src/main/java/module-info.java | 7 ++++--- echosvg-codec/build.gradle | 1 + .../src/main/java/module-info.java | 2 +- echosvg-css/build.gradle | 1 + echosvg-css/src/main/java/module-info.java | 4 +++- echosvg-dom/build.gradle | 1 + echosvg-dom/src/main/java/module-info.java | 8 +++++--- echosvg-ext/src/main/java/module-info.java | 8 +++++--- .../src/main/java/module-info.java | 3 ++- echosvg-gui-util/build.gradle | 3 ++- .../src/main/java/module-info.java | 15 ++++++++------ echosvg-gvt/src/main/java/module-info.java | 20 ++++++++++--------- echosvg-i18n/src/main/java/module-info.java | 4 +++- echosvg-parser/build.gradle | 1 + echosvg-parser/src/main/java/module-info.java | 4 +++- echosvg-script/build.gradle | 2 +- echosvg-script/src/main/java/module-info.java | 4 +++- .../src/main/java/module-info.java | 1 + .../src/main/java/module-info.java | 4 ++-- echosvg-svggen/build.gradle | 1 + echosvg-svggen/src/main/java/module-info.java | 1 + echosvg-svgpp/build.gradle | 2 +- echosvg-svgpp/src/main/java/module-info.java | 11 ++++++---- echosvg-svgrasterizer/build.gradle | 2 -- .../src/main/java/module-info.java | 3 ++- echosvg-swing/build.gradle | 1 - echosvg-swing/src/main/java/module-info.java | 5 +++-- echosvg-test/src/main/java/module-info.java | 4 +++- .../src/main/java/module-info.java | 1 + echosvg-ttf2svg/build.gradle | 2 +- .../src/main/java/module-info.java | 6 ++++-- echosvg-util/build.gradle | 2 +- echosvg-util/src/main/java/module-info.java | 1 + echosvg-xml/build.gradle | 1 + echosvg-xml/src/main/java/module-info.java | 6 ++++-- 40 files changed, 102 insertions(+), 58 deletions(-) diff --git a/echosvg-all/src/main/java/module-info.java b/echosvg-all/src/main/java/module-info.java index bce1bb344..c30bd7c6b 100644 --- a/echosvg-all/src/main/java/module-info.java +++ b/echosvg-all/src/main/java/module-info.java @@ -19,6 +19,7 @@ * Aggregate module. */ module io.sf.carte.echosvg { + requires transitive io.sf.carte.echosvg.apps.slideshow; requires transitive io.sf.carte.echosvg.anim; requires transitive io.sf.carte.echosvg.awt; requires transitive io.sf.carte.echosvg.bridge; @@ -26,8 +27,8 @@ requires transitive io.sf.carte.echosvg.css; requires transitive io.sf.carte.echosvg.dom; requires transitive io.sf.carte.echosvg.dom.svg; - requires transitive io.sf.carte.echosvg.external; requires transitive io.sf.carte.echosvg.extension; + requires transitive io.sf.carte.echosvg.external; requires transitive io.sf.carte.echosvg.gvt; requires transitive io.sf.carte.echosvg.i18n; requires transitive io.sf.carte.echosvg.parser; @@ -40,6 +41,6 @@ requires transitive io.sf.carte.echosvg.util; requires transitive io.sf.carte.echosvg.util.gui; requires transitive io.sf.carte.echosvg.xml; - requires transitive io.sf.carte.echosvg.apps.slideshow; + requires transitive org.w3c.dom.svg; } diff --git a/echosvg-anim/src/main/java/module-info.java b/echosvg-anim/src/main/java/module-info.java index 36b727720..0279ee93c 100644 --- a/echosvg-anim/src/main/java/module-info.java +++ b/echosvg-anim/src/main/java/module-info.java @@ -25,11 +25,13 @@ exports io.sf.carte.echosvg.anim.timing; requires transitive io.sf.carte.echosvg.awt; + requires transitive io.sf.carte.echosvg.dom.svg; + requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.external; requires io.sf.carte.echosvg.i18n; - requires io.sf.carte.echosvg.constants; - requires transitive io.sf.carte.echosvg.dom.svg; + requires io.sf.carte.css4j; + requires java.xml; requires jdk.xml.dom; } diff --git a/echosvg-awt-util/build.gradle b/echosvg-awt-util/build.gradle index 0fc5bd92f..820a7746c 100644 --- a/echosvg-awt-util/build.gradle +++ b/echosvg-awt-util/build.gradle @@ -5,6 +5,7 @@ plugins { dependencies { api project(':echosvg-util') + implementation project(':echosvg-i18n') api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" } diff --git a/echosvg-awt-util/src/main/java/module-info.java b/echosvg-awt-util/src/main/java/module-info.java index 1b08ce789..9cf5f1eae 100644 --- a/echosvg-awt-util/src/main/java/module-info.java +++ b/echosvg-awt-util/src/main/java/module-info.java @@ -34,10 +34,12 @@ exports io.sf.carte.echosvg.ext.awt.g2d; requires transitive io.sf.carte.echosvg.util; + requires io.sf.carte.echosvg.i18n; + // org.apache.xmlgraphics.commons should be a transitive dependency due to // ICCColorSpaceWithIntent from commons being used in this module's API. requires org.apache.xmlgraphics.commons; - requires io.sf.carte.echosvg.i18n; + requires java.desktop; uses io.sf.carte.echosvg.ext.awt.image.spi.ImageWriter; diff --git a/echosvg-bridge/build.gradle b/echosvg-bridge/build.gradle index 9173b4b89..670826b2b 100644 --- a/echosvg-bridge/build.gradle +++ b/echosvg-bridge/build.gradle @@ -4,9 +4,9 @@ plugins { } dependencies { + api project(':echosvg-anim') api project(':echosvg-gvt') api project(':echosvg-script') - api project(':echosvg-svg-dom') implementation "xml-apis:xml-apis:$xmlApisVersion" api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" } diff --git a/echosvg-bridge/src/main/java/module-info.java b/echosvg-bridge/src/main/java/module-info.java index e1977bf2c..b97f59fd7 100644 --- a/echosvg-bridge/src/main/java/module-info.java +++ b/echosvg-bridge/src/main/java/module-info.java @@ -25,14 +25,15 @@ exports io.sf.carte.echosvg.bridge; exports io.sf.carte.echosvg.bridge.svg12; + requires transitive io.sf.carte.echosvg.anim; requires transitive io.sf.carte.echosvg.external; requires transitive io.sf.carte.echosvg.gvt; requires transitive io.sf.carte.echosvg.script; - requires transitive io.sf.carte.echosvg.anim; - requires io.sf.carte.echosvg.parser; - requires io.sf.carte.echosvg.xml; requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.parser; + requires io.sf.carte.echosvg.xml; + requires org.apache.xmlgraphics.commons; provides io.sf.carte.echosvg.script.InterpreterFactory diff --git a/echosvg-codec/build.gradle b/echosvg-codec/build.gradle index c18be1310..37edf46df 100644 --- a/echosvg-codec/build.gradle +++ b/echosvg-codec/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { api project(':echosvg-awt-util') + implementation project(':echosvg-i18n') } description = 'io.sf.carte:echosvg-codec' diff --git a/echosvg-constants/src/main/java/module-info.java b/echosvg-constants/src/main/java/module-info.java index 518329c10..13728ac9c 100644 --- a/echosvg-constants/src/main/java/module-info.java +++ b/echosvg-constants/src/main/java/module-info.java @@ -19,5 +19,5 @@ * Constants library. */ module io.sf.carte.echosvg.constants { - exports io.sf.carte.echosvg.constants; + exports io.sf.carte.echosvg.constants; } diff --git a/echosvg-css/build.gradle b/echosvg-css/build.gradle index aa9eb7644..e1b82473b 100644 --- a/echosvg-css/build.gradle +++ b/echosvg-css/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { api project(':echosvg-util') + implementation project(':echosvg-i18n') api "io.sf.carte:svgom-api:${svgomVersion}" api "io.sf.carte:css4j:${css4jVersion}" testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" diff --git a/echosvg-css/src/main/java/module-info.java b/echosvg-css/src/main/java/module-info.java index 0fe173ce7..c1b9e47e7 100644 --- a/echosvg-css/src/main/java/module-info.java +++ b/echosvg-css/src/main/java/module-info.java @@ -28,9 +28,11 @@ requires transitive io.sf.carte.echosvg.util; requires io.sf.carte.echosvg.i18n; + requires transitive io.sf.carte.css4j; requires io.sf.carte.util; + requires transitive org.w3c.dom.svg; + requires java.xml; requires jdk.xml.dom; - requires transitive org.w3c.dom.svg; } diff --git a/echosvg-dom/build.gradle b/echosvg-dom/build.gradle index 4a0710e82..3ddc9f843 100644 --- a/echosvg-dom/build.gradle +++ b/echosvg-dom/build.gradle @@ -7,6 +7,7 @@ dependencies { api project(':echosvg-css') api project(':echosvg-ext') api project(':echosvg-xml') + implementation project(':echosvg-i18n') implementation "xml-apis:xml-apis:$xmlApisVersion" api "io.sf.carte:xml-dtd:${xmlDtdVersion}" api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" diff --git a/echosvg-dom/src/main/java/module-info.java b/echosvg-dom/src/main/java/module-info.java index f9fc19c40..ab194cc3a 100644 --- a/echosvg-dom/src/main/java/module-info.java +++ b/echosvg-dom/src/main/java/module-info.java @@ -28,14 +28,16 @@ exports io.sf.carte.echosvg.dom.xbl; exports io.sf.carte.echosvg.dom.events; - requires io.sf.carte.echosvg.constants; requires transitive io.sf.carte.echosvg.css; + requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.external; - requires io.sf.carte.echosvg.xml; requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.xml; + + requires io.sf.carte.xml.dtd; + requires transitive java.xml; requires transitive jdk.xml.dom; - requires io.sf.carte.xml.dtd; uses org.xml.sax.XMLReader; uses io.sf.carte.echosvg.dom.DomExtension; diff --git a/echosvg-ext/src/main/java/module-info.java b/echosvg-ext/src/main/java/module-info.java index ad636270a..f417cb73f 100644 --- a/echosvg-ext/src/main/java/module-info.java +++ b/echosvg-ext/src/main/java/module-info.java @@ -19,8 +19,10 @@ * Interfaces to be used by external code. */ module io.sf.carte.echosvg.external { - exports io.sf.carte.echosvg.w3c.dom; - exports io.sf.carte.echosvg.w3c.dom.events; - requires transitive java.xml; + exports io.sf.carte.echosvg.w3c.dom; + exports io.sf.carte.echosvg.w3c.dom.events; + + requires transitive java.xml; + } diff --git a/echosvg-extension/src/main/java/module-info.java b/echosvg-extension/src/main/java/module-info.java index b2e978181..24b1b05bd 100644 --- a/echosvg-extension/src/main/java/module-info.java +++ b/echosvg-extension/src/main/java/module-info.java @@ -28,9 +28,10 @@ requires transitive io.sf.carte.echosvg.bridge; requires io.sf.carte.echosvg.constants; - requires jdk.xml.dom; requires transitive org.w3c.dom.svg; + requires jdk.xml.dom; + provides io.sf.carte.echosvg.bridge.BridgeExtension with io.sf.carte.echosvg.extension.svg.EchoSVGBridgeExtension; diff --git a/echosvg-gui-util/build.gradle b/echosvg-gui-util/build.gradle index a01739cf9..e5bc7ae91 100644 --- a/echosvg-gui-util/build.gradle +++ b/echosvg-gui-util/build.gradle @@ -3,7 +3,8 @@ plugins { } dependencies { - api project(':echosvg-xml') + api project(':echosvg-util') + implementation project(':echosvg-xml') } description = 'io.sf.carte:echosvg-gui-util' diff --git a/echosvg-gui-util/src/main/java/module-info.java b/echosvg-gui-util/src/main/java/module-info.java index ae0704511..006cb83a1 100644 --- a/echosvg-gui-util/src/main/java/module-info.java +++ b/echosvg-gui-util/src/main/java/module-info.java @@ -19,11 +19,14 @@ * GUI utilities. */ module io.sf.carte.echosvg.util.gui { - exports io.sf.carte.echosvg.util.gui.resource; - exports io.sf.carte.echosvg.util.gui.xmleditor; - exports io.sf.carte.echosvg.util.gui; - requires io.sf.carte.echosvg.util; - requires io.sf.carte.echosvg.xml; - requires transitive java.desktop; + exports io.sf.carte.echosvg.util.gui.resource; + exports io.sf.carte.echosvg.util.gui.xmleditor; + exports io.sf.carte.echosvg.util.gui; + + requires io.sf.carte.echosvg.util; + requires io.sf.carte.echosvg.xml; + + requires transitive java.desktop; + } diff --git a/echosvg-gvt/src/main/java/module-info.java b/echosvg-gvt/src/main/java/module-info.java index 753b1efd0..8829f7dda 100644 --- a/echosvg-gvt/src/main/java/module-info.java +++ b/echosvg-gvt/src/main/java/module-info.java @@ -19,14 +19,16 @@ * Graphics Vector Tree (GVT). */ module io.sf.carte.echosvg.gvt { - exports io.sf.carte.echosvg.gvt.font; - exports io.sf.carte.echosvg.gvt.flow; - exports io.sf.carte.echosvg.gvt.event; - exports io.sf.carte.echosvg.gvt; - exports io.sf.carte.echosvg.gvt.renderer; - exports io.sf.carte.echosvg.gvt.text; - exports io.sf.carte.echosvg.gvt.filter; - requires transitive io.sf.carte.echosvg.awt; - requires transitive io.sf.carte.echosvg.util; + exports io.sf.carte.echosvg.gvt.font; + exports io.sf.carte.echosvg.gvt.flow; + exports io.sf.carte.echosvg.gvt.event; + exports io.sf.carte.echosvg.gvt; + exports io.sf.carte.echosvg.gvt.renderer; + exports io.sf.carte.echosvg.gvt.text; + exports io.sf.carte.echosvg.gvt.filter; + + requires transitive io.sf.carte.echosvg.awt; + requires transitive io.sf.carte.echosvg.util; + } diff --git a/echosvg-i18n/src/main/java/module-info.java b/echosvg-i18n/src/main/java/module-info.java index 2d48ff49a..791011118 100644 --- a/echosvg-i18n/src/main/java/module-info.java +++ b/echosvg-i18n/src/main/java/module-info.java @@ -19,5 +19,7 @@ * i18n library. */ module io.sf.carte.echosvg.i18n { - exports io.sf.carte.echosvg.i18n; + + exports io.sf.carte.echosvg.i18n; + } diff --git a/echosvg-parser/build.gradle b/echosvg-parser/build.gradle index bdcbdb392..80e8f5efc 100644 --- a/echosvg-parser/build.gradle +++ b/echosvg-parser/build.gradle @@ -6,6 +6,7 @@ plugins { dependencies { api project(':echosvg-awt-util') api project(':echosvg-xml') + api project(':echosvg-i18n') api "io.sf.carte:svgom-api:${svgomVersion}" api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" } diff --git a/echosvg-parser/src/main/java/module-info.java b/echosvg-parser/src/main/java/module-info.java index 6c61ba68d..96bdf3e4a 100644 --- a/echosvg-parser/src/main/java/module-info.java +++ b/echosvg-parser/src/main/java/module-info.java @@ -22,8 +22,10 @@ exports io.sf.carte.echosvg.parser; requires io.sf.carte.echosvg.awt; - requires io.sf.carte.echosvg.xml; requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.xml; + requires transitive org.w3c.dom.svg; + requires transitive java.desktop; } diff --git a/echosvg-script/build.gradle b/echosvg-script/build.gradle index 464e29abe..485dbe64c 100644 --- a/echosvg-script/build.gradle +++ b/echosvg-script/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - api project(':echosvg-anim') + implementation project(':echosvg-anim') api "org.mozilla:rhino:${rhinoVersion}" implementation "xml-apis:xml-apis:$xmlApisVersion" } diff --git a/echosvg-script/src/main/java/module-info.java b/echosvg-script/src/main/java/module-info.java index dd769b299..ebd65a904 100644 --- a/echosvg-script/src/main/java/module-info.java +++ b/echosvg-script/src/main/java/module-info.java @@ -26,8 +26,10 @@ requires io.sf.carte.echosvg.anim; requires io.sf.carte.echosvg.i18n; - requires transitive java.xml; + requires transitive org.mozilla.rhino; + requires transitive java.xml; + uses io.sf.carte.echosvg.script.InterpreterFactory; } diff --git a/echosvg-slideshow/src/main/java/module-info.java b/echosvg-slideshow/src/main/java/module-info.java index 52af5aaaf..20221e469 100644 --- a/echosvg-slideshow/src/main/java/module-info.java +++ b/echosvg-slideshow/src/main/java/module-info.java @@ -23,5 +23,6 @@ requires transitive io.sf.carte.echosvg.bridge; requires io.sf.carte.echosvg.gvt; + requires transitive org.w3c.dom.svg; } diff --git a/echosvg-svg-dom/src/main/java/module-info.java b/echosvg-svg-dom/src/main/java/module-info.java index e6ed321b8..8408c830e 100644 --- a/echosvg-svg-dom/src/main/java/module-info.java +++ b/echosvg-svg-dom/src/main/java/module-info.java @@ -22,8 +22,8 @@ exports io.sf.carte.echosvg.dom.svg12; exports io.sf.carte.echosvg.dom.svg; - requires io.sf.carte.echosvg.awt; requires transitive io.sf.carte.echosvg.css; - requires transitive io.sf.carte.echosvg.parser; requires transitive io.sf.carte.echosvg.dom; + requires transitive io.sf.carte.echosvg.parser; + requires io.sf.carte.echosvg.awt; } diff --git a/echosvg-svggen/build.gradle b/echosvg-svggen/build.gradle index 1a8ccdda6..e302b9e8c 100644 --- a/echosvg-svggen/build.gradle +++ b/echosvg-svggen/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { api project(':echosvg-awt-util') + implementation project(':echosvg-i18n') runtimeOnly project(':echosvg-codec') } diff --git a/echosvg-svggen/src/main/java/module-info.java b/echosvg-svggen/src/main/java/module-info.java index 8b644b219..179b7d61c 100644 --- a/echosvg-svggen/src/main/java/module-info.java +++ b/echosvg-svggen/src/main/java/module-info.java @@ -26,5 +26,6 @@ requires transitive io.sf.carte.echosvg.awt; requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.i18n; + requires java.xml; } diff --git a/echosvg-svgpp/build.gradle b/echosvg-svgpp/build.gradle index d4b005014..0bf2b1803 100644 --- a/echosvg-svgpp/build.gradle +++ b/echosvg-svgpp/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - api project(':echosvg-transcoder') + implementation project(':echosvg-transcoder') } description = 'io.sf.carte:echosvg-svgpp' diff --git a/echosvg-svgpp/src/main/java/module-info.java b/echosvg-svgpp/src/main/java/module-info.java index d2f677f4a..9550fb541 100644 --- a/echosvg-svgpp/src/main/java/module-info.java +++ b/echosvg-svgpp/src/main/java/module-info.java @@ -19,9 +19,12 @@ * SVG Pretty Printer Application. */ module io.sf.carte.echosvg.svgpp { - exports io.sf.carte.echosvg.apps.svgpp; - requires io.sf.carte.echosvg.i18n; - requires io.sf.carte.echosvg.transcoder; - requires java.xml; + exports io.sf.carte.echosvg.apps.svgpp; + + requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.transcoder; + + requires java.xml; + } diff --git a/echosvg-svgrasterizer/build.gradle b/echosvg-svgrasterizer/build.gradle index 44700c940..76680bcf8 100644 --- a/echosvg-svgrasterizer/build.gradle +++ b/echosvg-svgrasterizer/build.gradle @@ -10,9 +10,7 @@ sourceSets { } dependencies { - api project(':echosvg-parser') api project(':echosvg-transcoder') - api project(':echosvg-util') testImplementation project(':echosvg-test') testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/echosvg-svgrasterizer/src/main/java/module-info.java b/echosvg-svgrasterizer/src/main/java/module-info.java index f3e580286..932b6a841 100644 --- a/echosvg-svgrasterizer/src/main/java/module-info.java +++ b/echosvg-svgrasterizer/src/main/java/module-info.java @@ -21,8 +21,9 @@ module io.sf.carte.echosvg.svgrasterizer { exports io.sf.carte.echosvg.apps.rasterizer; - requires io.sf.carte.echosvg.i18n; requires transitive io.sf.carte.echosvg.transcoder; + requires io.sf.carte.echosvg.i18n; + requires transitive java.desktop; requires java.xml; } diff --git a/echosvg-swing/build.gradle b/echosvg-swing/build.gradle index e4d9a146b..1e63a8b76 100644 --- a/echosvg-swing/build.gradle +++ b/echosvg-swing/build.gradle @@ -4,7 +4,6 @@ plugins { dependencies { api project(':echosvg-bridge') - api project(':echosvg-ext') api project(':echosvg-gui-util') implementation "xml-apis:xml-apis:$xmlApisVersion" } diff --git a/echosvg-swing/src/main/java/module-info.java b/echosvg-swing/src/main/java/module-info.java index 643b599f0..f8c7039a5 100644 --- a/echosvg-swing/src/main/java/module-info.java +++ b/echosvg-swing/src/main/java/module-info.java @@ -25,9 +25,10 @@ requires transitive io.sf.carte.echosvg.bridge; requires io.sf.carte.echosvg.constants; - requires io.sf.carte.echosvg.util.gui; - requires io.sf.carte.echosvg.gvt; requires io.sf.carte.echosvg.dom.svg; + requires io.sf.carte.echosvg.gvt; requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.util.gui; + requires java.datatransfer; } diff --git a/echosvg-test/src/main/java/module-info.java b/echosvg-test/src/main/java/module-info.java index d2622b901..8f7bc6220 100644 --- a/echosvg-test/src/main/java/module-info.java +++ b/echosvg-test/src/main/java/module-info.java @@ -25,9 +25,11 @@ exports io.sf.carte.echosvg.test.swing; requires transitive io.sf.carte.echosvg.swing; - requires io.sf.carte.echosvg.transcoder; requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.transcoder; + requires io.sf.jclf.text; + requires transitive java.desktop; /* diff --git a/echosvg-transcoder/src/main/java/module-info.java b/echosvg-transcoder/src/main/java/module-info.java index e80793a70..b84e7f8aa 100644 --- a/echosvg-transcoder/src/main/java/module-info.java +++ b/echosvg-transcoder/src/main/java/module-info.java @@ -33,6 +33,7 @@ requires io.sf.carte.echosvg.codec; requires io.sf.carte.echosvg.i18n; requires io.sf.carte.echosvg.xml; + requires io.sf.carte.xml.dtd; requires io.sf.carte.css4j.awt; } diff --git a/echosvg-ttf2svg/build.gradle b/echosvg-ttf2svg/build.gradle index 5493a8f49..dfa51964d 100644 --- a/echosvg-ttf2svg/build.gradle +++ b/echosvg-ttf2svg/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - api project(':echosvg-svggen') + implementation project(':echosvg-svggen') } description = 'io.sf.carte:echosvg-ttf2svg' diff --git a/echosvg-ttf2svg/src/main/java/module-info.java b/echosvg-ttf2svg/src/main/java/module-info.java index c59302766..ab626a4c2 100644 --- a/echosvg-ttf2svg/src/main/java/module-info.java +++ b/echosvg-ttf2svg/src/main/java/module-info.java @@ -19,7 +19,9 @@ * Truetype font to SVG font converter application. */ module io.sf.carte.echosvg.ttf2svg { - exports io.sf.carte.echosvg.apps.ttf2svg; - requires io.sf.carte.echosvg.svggen; + exports io.sf.carte.echosvg.apps.ttf2svg; + + requires io.sf.carte.echosvg.svggen; + } diff --git a/echosvg-util/build.gradle b/echosvg-util/build.gradle index 37de2567a..aff70cdd3 100644 --- a/echosvg-util/build.gradle +++ b/echosvg-util/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { api project(':echosvg-constants') - api project(':echosvg-i18n') + implementation project(':echosvg-i18n') testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/echosvg-util/src/main/java/module-info.java b/echosvg-util/src/main/java/module-info.java index ae2414388..503e61da1 100644 --- a/echosvg-util/src/main/java/module-info.java +++ b/echosvg-util/src/main/java/module-info.java @@ -27,6 +27,7 @@ requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.i18n; + requires transitive java.desktop; uses io.sf.carte.echosvg.util.ParsedURLProtocolHandler; diff --git a/echosvg-xml/build.gradle b/echosvg-xml/build.gradle index 237360c82..ade5c07b1 100644 --- a/echosvg-xml/build.gradle +++ b/echosvg-xml/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { api project(':echosvg-util') + implementation project(':echosvg-i18n') } description = 'io.sf.carte:echosvg-xml' diff --git a/echosvg-xml/src/main/java/module-info.java b/echosvg-xml/src/main/java/module-info.java index e0c7ab32c..9d51c700d 100644 --- a/echosvg-xml/src/main/java/module-info.java +++ b/echosvg-xml/src/main/java/module-info.java @@ -19,8 +19,10 @@ * XML utilities. */ module io.sf.carte.echosvg.xml { - exports io.sf.carte.echosvg.xml; - requires io.sf.carte.echosvg.util; + exports io.sf.carte.echosvg.xml; + requires io.sf.carte.echosvg.i18n; + requires io.sf.carte.echosvg.util; + }