Skip to content

Commit

Permalink
awt: move io.sf.carte.echosvg.ext.swing package to its own new module
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosame committed Feb 1, 2025
1 parent d1a1062 commit 8dff200
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 2 deletions.
4 changes: 4 additions & 0 deletions MIGRATING_FROM_BATIK.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ Batik:
the old class of the same name located at `io.sf.carte.echosvg.transcoder`.

15) Field `SVGDOMImplementation.svg11Factories` was renamed to `svgFactories`.

16) Package `io.sf.carte.echosvg.ext.swing` was moved from `echosvg-awt-util` to
a new `io.sf.carte.echosvg.ext.swing` module (`echosvg-ext-swing` Gradle
name).
8 changes: 8 additions & 0 deletions echosvg-all/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ description = 'io.sf.carte:echosvg-all'
dependencies {
api project(':echosvg-script')
api project(':echosvg-ext')
api project(':echosvg-ext-swing')
api project(':echosvg-extension')
api project(':echosvg-gui-util')
api project(':echosvg-swing')
Expand All @@ -31,6 +32,7 @@ dependencies {
jacocoAggregation project(':echosvg-css')
jacocoAggregation project(':echosvg-dom')
jacocoAggregation project(':echosvg-ext')
jacocoAggregation project(':echosvg-ext-swing')
jacocoAggregation project(':echosvg-extension')
jacocoAggregation project(':echosvg-gui-util')
jacocoAggregation project(':echosvg-gvt')
Expand Down Expand Up @@ -151,6 +153,11 @@ tasks.register('prepareModularSources') {
include(name: '**/*')
}
}
ant.copy(todir: "$buildDir/src/io.sf.carte.echosvg.ext.swing") {
fileset(dir: "$rootDir/echosvg-ext-swing/src/main/java") {
include(name: '**/*')
}
}
ant.copy(todir: "$buildDir/src/io.sf.carte.echosvg.external") {
fileset(dir: "$rootDir/echosvg-ext/src/main/java") {
include(name: '**/*')
Expand Down Expand Up @@ -301,6 +308,7 @@ tasks.register('modularJavadoc', Javadoc) {
"$buildDir/src/io.sf.carte.echosvg.css",
"$buildDir/src/io.sf.carte.echosvg.dom",
"$buildDir/src/io.sf.carte.echosvg.dom.svg",
"$buildDir/src/io.sf.carte.echosvg.ext.swing",
"$buildDir/src/io.sf.carte.echosvg.external",
"$buildDir/src/io.sf.carte.echosvg.extension",
"$buildDir/src/io.sf.carte.echosvg.gvt",
Expand Down
1 change: 0 additions & 1 deletion echosvg-awt-util/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
module io.sf.carte.echosvg.awt {
exports io.sf.carte.echosvg.ext.awt.image.renderable;
exports io.sf.carte.echosvg.ext.awt;
exports io.sf.carte.echosvg.ext.swing;
exports io.sf.carte.echosvg.ext.awt.image.spi;
exports io.sf.carte.echosvg.ext.awt.image.rendered;
exports io.sf.carte.echosvg.ext.awt.image;
Expand Down
14 changes: 14 additions & 0 deletions echosvg-ext-swing/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id 'echosvg.java-conventions'
}

dependencies {
implementation project(':echosvg-i18n')
implementation project(':echosvg-util')
}

description = 'io.sf.carte:echosvg-ext-swing'

publishing.publications.maven(MavenPublication).pom {
description = 'EchoSVG swing utilities'
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected Messages() {
/**
* The localizable support for the error messages.
*/
protected static LocalizableSupport localizableSupport = new LocalizableSupport(RESOURCES,
static LocalizableSupport localizableSupport = new LocalizableSupport(RESOURCES,
Messages.class.getClassLoader());

/**
Expand Down
31 changes: 31 additions & 0 deletions echosvg-ext-swing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* EchoSVG swing utilities.
*/
module io.sf.carte.echosvg.ext.swing {

exports io.sf.carte.echosvg.ext.swing;

requires io.sf.carte.echosvg.i18n;
requires io.sf.carte.echosvg.util;

requires transitive java.desktop;

}
2 changes: 2 additions & 0 deletions echosvg-svggen/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
requires transitive io.sf.carte.echosvg.awt;
requires io.sf.carte.echosvg.constants;
requires io.sf.carte.echosvg.i18n;
requires io.sf.carte.echosvg.util;

requires transitive java.desktop;
requires java.xml;
}
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ include(':echosvg-constants')
include(':echosvg-xml')
include(':echosvg-util')
include(':echosvg-gui-util')
include(':echosvg-ext-swing')
include(':echosvg-awt-util')
include(':echosvg-gvt')
include(':echosvg-ext')
Expand Down

0 comments on commit 8dff200

Please sign in to comment.