[FOray-commit] SF.net SVN: foray:[13873] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[13873] trunk/foray
|
From: <vic...@us...> - 2025-06-26 12:31:03
|
Revision: 13873
http://sourceforge.net/p/foray/code/13873
Author: victormote
Date: 2025-06-26 12:31:00 +0000 (Thu, 26 Jun 2025)
Log Message:
-----------
Make gradle libs more consistent.
Modified Paths:
--------------
trunk/foray/build.gradle
trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle
trunk/foray/buildSrc/src/main/groovy/foray.test-fixtures-conventions.gradle
trunk/foray/foray-app/build.gradle
trunk/foray/foray-areatree/build.gradle
trunk/foray/foray-common/build.gradle
trunk/foray/foray-core/build.gradle
trunk/foray/foray-font/build.gradle
trunk/foray/foray-fotree/build.gradle
trunk/foray/foray-graphic/build.gradle
trunk/foray/foray-orthography/build.gradle
trunk/foray/foray-pdf/build.gradle
trunk/foray/foray-primitive/build.gradle
trunk/foray/foray-ps/build.gradle
trunk/foray/foray-ps-data/build.gradle
trunk/foray/foray-render/build.gradle
trunk/foray/foray-xml/build.gradle
trunk/foray/foray-zz-attic/build.gradle
trunk/foray/gradle/libs.versions.toml
Modified: trunk/foray/build.gradle
===================================================================
--- trunk/foray/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -166,9 +166,9 @@
}
dependencies {
- checkerFramework libs.checkerFramework
- compileOnly libs.checkerQual
- testCompileOnly libs.checkerQual
+ checkerFramework libs.checker.framework
+ compileOnly libs.checker.qual
+ testCompileOnly libs.checker.qual
}
}
Modified: trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -5,9 +5,9 @@
}
dependencies {
- testImplementation (platform libs.junitBom)
- testImplementation libs.junitJupiter
- testRuntimeOnly libs.junitPlatformLauncher
+ testImplementation (platform libs.junit.bom)
+ testImplementation libs.junit.jupiter
+ testRuntimeOnly libs.junit.platform.launcher
testImplementation libs.mockito
}
Modified: trunk/foray/buildSrc/src/main/groovy/foray.test-fixtures-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.test-fixtures-conventions.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/buildSrc/src/main/groovy/foray.test-fixtures-conventions.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -8,8 +8,8 @@
dependencies {
/* Allow test fixtures to make assertions and use Mockito. */
- testFixturesImplementation (platform libs.junitBom)
- testFixturesImplementation libs.junitJupiter
+ testFixturesImplementation (platform libs.junit.bom)
+ testFixturesImplementation libs.junit.jupiter
testFixturesImplementation libs.mockito
}
Modified: trunk/foray/foray-app/build.gradle
===================================================================
--- trunk/foray/foray-app/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-app/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -8,48 +8,48 @@
description = 'foray-app'
dependencies {
- implementation libs.servletApi
- implementation libs.xmlResolver
- implementation libs.ant
- implementation libs.commonsIo
- implementation libs.commonsCli
+ implementation libs.servlet.api
+ implementation libs.xml.resolver
+ implementation libs.ant
+ implementation libs.commons.io
+ implementation libs.commons.cli
- implementation libs.axsl.font
- implementation libs.axsl.linebreak
- implementation libs.axsl.ps
- implementation libs.axsl.areatree
- implementation libs.axsl.output
- implementation libs.axsl.fotree
- implementation libs.axsl.galley
- implementation libs.axsl.orthography
- implementation libs.axsl.graphic
- implementation libs.axsl.layout
- implementation libs.axsl.speech
- implementation libs.axsl.mif
- implementation libs.axsl.pdf
+ implementation libs.axsl.font
+ implementation libs.axsl.linebreak
+ implementation libs.axsl.ps
+ implementation libs.axsl.areatree
+ implementation libs.axsl.output
+ implementation libs.axsl.fotree
+ implementation libs.axsl.galley
+ implementation libs.axsl.orthography
+ implementation libs.axsl.graphic
+ implementation libs.axsl.layout
+ implementation libs.axsl.speech
+ implementation libs.axsl.mif
+ implementation libs.axsl.pdf
- implementation (project(':foray-areatree'))
- implementation (project(':foray-common'))
- implementation (project(':foray-core'))
- implementation (project(':foray-font'))
- implementation (project(':foray-fotree'))
- implementation (project(':foray-graphic'))
- implementation (project(':foray-layout'))
- implementation (project(':foray-mif'))
- implementation (project(':foray-orthography'))
- implementation (project(':foray-output'))
- implementation (project(':foray-pdf'))
- implementation (project(':foray-pioneer'))
- implementation (project(':foray-ps'))
- implementation (project(':foray-render'))
- implementation (project(':foray-speech'))
- implementation (project(':foray-linebreak'))
+ implementation project(':foray-areatree')
+ implementation project(':foray-common')
+ implementation project(':foray-core')
+ implementation project(':foray-font')
+ implementation project(':foray-fotree')
+ implementation project(':foray-graphic')
+ implementation project(':foray-layout')
+ implementation project(':foray-mif')
+ implementation project(':foray-orthography')
+ implementation project(':foray-output')
+ implementation project(':foray-pdf')
+ implementation project(':foray-pioneer')
+ implementation project(':foray-ps')
+ implementation project(':foray-render')
+ implementation project(':foray-speech')
+ implementation project(':foray-linebreak')
- testFixturesImplementation (project(':foray-areatree'))
- testFixturesImplementation (project(':foray-core'))
- testFixturesImplementation (project(':foray-fotree'))
- testFixturesImplementation (project(':foray-pioneer'))
+ testFixturesImplementation project(':foray-areatree')
+ testFixturesImplementation project(':foray-core')
+ testFixturesImplementation project(':foray-fotree')
+ testFixturesImplementation project(':foray-pioneer')
testImplementation(testFixtures(libs.axsl.fotree))
}
Modified: trunk/foray/foray-areatree/build.gradle
===================================================================
--- trunk/foray/foray-areatree/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-areatree/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,18 +1,18 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-areatree'
+description = "foray-areatree"
dependencies {
- api libs.svg.lib
- api libs.mathml.lib
+ api libs.svg.dom
+ api libs.mathml.dom
- api libs.axsl.areatree
- api libs.axsl.font
- api libs.axsl.fotree
+ api libs.axsl.areatree
+ api libs.axsl.font
+ api libs.axsl.fotree
/* We dislike declaring a direct dependency on axsl-galley here as axsl-areatree is intended to be a direct superset
* of it, and a dependency on axsl-areatree should be sufficient. Indeed, from a gradle standpoint it is, as gradle
* handles the transitive dependency properly. However, there is no build pattern (known to us) that allows a module
@@ -19,16 +19,16 @@
* to declare that its API is a direct (non-transitive) superset of another module's API. Since we are using the
* autonomousapps dependency-analysis tool, which (for good reason) dislikes having transitive dependencies
* accidentally leak into the API of client code, we declare a direct dependency on axsl-galley here. */
- api libs.axsl.galley
- api libs.axsl.graphic
- api libs.axsl.i18n
- api libs.axsl.orthography
- api libs.axsl.value
- implementation libs.axsl.constants
- implementation libs.axsl.kp.model
+ api libs.axsl.galley
+ api libs.axsl.graphic
+ api libs.axsl.i18n
+ api libs.axsl.orthography
+ api libs.axsl.value
+ implementation libs.axsl.constants
+ implementation libs.axsl.kp.model
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
+ api project(":foray-common")
+ implementation project(":foray-primitive")
}
javadoc {
Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-common/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,24 +1,24 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
/* TODO: foray-common should probably not have a dependency on logging. */
- id 'foray.logging-conventions'
+ id "foray.logging-conventions"
}
-description = 'foray-common'
+description = "foray-common"
dependencies {
- implementation libs.commonsIo
- implementation libs.icu4j
+ implementation libs.commons.io
+ implementation libs.icu4j
- implementation libs.axsl.primitive
- implementation libs.axsl.i18n
- implementation libs.axsl.kp.model
- implementation libs.axsl.ps
- implementation libs.axsl.constants
- implementation libs.axsl.value
+ implementation libs.axsl.primitive
+ implementation libs.axsl.i18n
+ implementation libs.axsl.kp.model
+ implementation libs.axsl.ps
+ implementation libs.axsl.constants
+ implementation libs.axsl.value
- implementation project(':foray-primitive')
+ implementation project(":foray-primitive")
}
javadoc {
@@ -29,10 +29,10 @@
/* We want the DTDs to live as part of the website files, so we need to copy them into the jar file here. */
jar {
- from rootProject.projectDir.absolutePath + '/foray-00-dev/doc/web/dtds/0.1/en/',
+ from rootProject.projectDir.absolutePath + "/foray-00-dev/doc/web/dtds/0.1/en/",
{
- include 'foray-config.dtd'
- into '/resources/org/foray/dtds/'
+ include "foray-config.dtd"
+ into "/resources/org/foray/dtds/"
}
}
Modified: trunk/foray/foray-core/build.gradle
===================================================================
--- trunk/foray/foray-core/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-core/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,27 +1,27 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-core'
+description = "foray-core"
dependencies {
- implementation libs.xmlResolver
+ implementation libs.xml.resolver
- api libs.axsl.areatree
- api libs.axsl.fotree
- api libs.axsl.font
- implementation libs.axsl.galley
- api libs.axsl.graphic
- api libs.axsl.layout
- api libs.axsl.orthography
- api libs.axsl.output
- api libs.axsl.speech
- api libs.axsl.linebreak
- implementation libs.axsl.constants
+ api libs.axsl.areatree
+ api libs.axsl.fotree
+ api libs.axsl.font
+ implementation libs.axsl.galley
+ api libs.axsl.graphic
+ api libs.axsl.layout
+ api libs.axsl.orthography
+ api libs.axsl.output
+ api libs.axsl.speech
+ api libs.axsl.linebreak
+ implementation libs.axsl.constants
- api (project(':foray-common'))
- api (project(':foray-xml'))
+ api project(":foray-common")
+ api project(":foray-xml")
}
javadoc {
@@ -32,10 +32,10 @@
/* We want the DTDs to live as part of the website files, so we need to copy them into the jar file here. */
jar {
- from rootProject.projectDir.absolutePath + '/doc/web/dtds/0.1/en/',
+ from rootProject.projectDir.absolutePath + "/doc/web/dtds/0.1/en/",
{
- include '*.dtd'
- into '/resources/org/foray/dtds/'
+ include "*.dtd"
+ into "/resources/org/foray/dtds/"
}
}
Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-font/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,16 +1,16 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-font'
+description = "foray-font"
dependencies {
- api libs.commonsIo
- implementation libs.commonsDiscovery
- api libs.commonsCli
+ api libs.commons.io
+ implementation libs.commons.discovery
+ api libs.commons.cli
api libs.axsl.primitive
api libs.axsl.font
@@ -19,13 +19,13 @@
implementation libs.axsl.constants
api libs.axsl.value
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
- api (project(':foray-xml'))
- api (project(':foray-ps-data'))
- api (project(':foray-font-parse'))
+ api project(":foray-common")
+ implementation project(":foray-primitive")
+ api project(":foray-xml")
+ api project(":foray-ps-data")
+ api project(":foray-font-parse")
- testRuntimeOnly (project(':foray-ps'))
+ testRuntimeOnly project(":foray-ps")
}
@@ -41,12 +41,12 @@
outputs.upToDateWhen { false }
description = "Parse and serialize the Base-14 metrics files"
classpath = sourceSets.main.runtimeClasspath
- mainClass = 'org.foray.font.format.type1.Type1MetricsSerializer'
- args('--input')
- args('src/main/data/base-14')
- args('--output')
- args('src/main/resources/resources/org/foray/font/base14')
- args('--pattern')
+ mainClass = "org.foray.font.format.type1.Type1MetricsSerializer"
+ args("--input")
+ args("src/main/data/base-14")
+ args("--output")
+ args("src/main/resources/resources/org/foray/font/base14")
+ args("--pattern")
args('^.*\\.afm$')
}
Modified: trunk/foray/foray-fotree/build.gradle
===================================================================
--- trunk/foray/foray-fotree/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-fotree/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,10 +1,10 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-fotree'
+description = "foray-fotree"
dependencies {
@@ -20,25 +20,25 @@
*/
- api libs.svg.lib
- api libs.mathml.lib
+ api libs.svg.dom
+ api libs.mathml.dom
/* TODO: Replace this dependency on batik-anim, used for parsing SVGDocument, with something more lightweight. */
- implementation libs.batikAnim
+ implementation libs.batik.anim
- api libs.axsl.constants
- api libs.axsl.fotree
- implementation libs.axsl.primitive
- api libs.axsl.i18n
- api libs.axsl.orthography
- api libs.axsl.kp.model
- implementation libs.axsl.constants
- api libs.axsl.value
+ api libs.axsl.constants
+ api libs.axsl.fotree
+ implementation libs.axsl.primitive
+ api libs.axsl.i18n
+ api libs.axsl.orthography
+ api libs.axsl.kp.model
+ implementation libs.axsl.constants
+ api libs.axsl.value
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
- api (project(':foray-xml'))
+ api project(":foray-common")
+ implementation project(":foray-primitive")
+ api project(":foray-xml")
- testImplementation testFixtures(libs.axsl.fotree)
+ testImplementation testFixtures(libs.axsl.fotree)
}
javadoc {
Modified: trunk/foray/foray-graphic/build.gradle
===================================================================
--- trunk/foray/foray-graphic/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-graphic/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,37 +1,37 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-graphic'
+description = "foray-graphic"
dependencies {
- api libs.xmlgraphicsCommons
- api libs.batikBridge
- api libs.batikGvt
- implementation libs.batikParser
- implementation libs.batikTranscoder
- implementation libs.batikAnim
- api libs.batikDom
- implementation libs.batikUtil
- api (group: "xml-apis", name: "xml-apis", version: "1.4.01")
- api (group: "xml-apis", name: "xml-apis-ext", version: "1.3.04")
- api libs.jeuclid
- api libs.svg.lib
- api libs.mathml.lib
+ api libs.xmlgraphics.commons
+ api libs.batik.bridge
+ api libs.batik.gvt
+ implementation libs.batik.parser
+ implementation libs.batik.transcoder
+ implementation libs.batik.anim
+ api libs.batik.dom
+ implementation libs.batik.util
+ api (group: "xml-apis", name: "xml-apis", version: "1.4.01")
+ api (group: "xml-apis", name: "xml-apis-ext", version: "1.3.04")
+ api libs.jeuclid
+ api libs.svg.dom
+ api libs.mathml.dom
- api libs.axsl.constants
- api libs.axsl.primitive
- api libs.axsl.font
- api libs.axsl.graphic
- api libs.axsl.orthography
- api libs.axsl.ps
- api libs.axsl.value
+ api libs.axsl.constants
+ api libs.axsl.primitive
+ api libs.axsl.font
+ api libs.axsl.graphic
+ api libs.axsl.orthography
+ api libs.axsl.ps
+ api libs.axsl.value
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
- implementation (project(':foray-xml'))
+ api project(":foray-common")
+ implementation project(":foray-primitive")
+ implementation project(":foray-xml")
}
javadoc {
Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-orthography/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,27 +1,27 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-orthography'
+description = "foray-orthography"
dependencies {
- api libs.commonsCli
- api libs.commonsIo
- implementation libs.icu4j
+ api libs.commons.cli
+ api libs.commons.io
+ implementation libs.icu4j
- implementation libs.axsl.constants
- api libs.axsl.fotree
- api libs.axsl.i18n
- api libs.axsl.kp.model
- api libs.axsl.orthography
- api libs.axsl.primitive
- api libs.axsl.value
+ implementation libs.axsl.constants
+ api libs.axsl.fotree
+ api libs.axsl.i18n
+ api libs.axsl.kp.model
+ api libs.axsl.orthography
+ api libs.axsl.primitive
+ api libs.axsl.value
- api (project(':foray-common'))
- api (project(':foray-primitive'))
- api (project(':foray-xml'))
+ api project(":foray-common")
+ api project(":foray-primitive")
+ api project(":foray-xml")
}
@@ -37,12 +37,12 @@
outputs.upToDateWhen { false }
description = "Parse and serialize the hyphenation patterns"
classpath = sourceSets.main.runtimeClasspath
- mainClass = 'org.foray.orthography.util.PatternSerializer'
- args('--input')
- args('src/main/data/hyph-patterns')
- args('--output')
- args('src/main/resources/resources/org/foray/orthography/hyphPatterns')
- args('--pattern')
+ mainClass = "org.foray.orthography.util.PatternSerializer"
+ args("--input")
+ args("src/main/data/hyph-patterns")
+ args("--output")
+ args("src/main/resources/resources/org/foray/orthography/hyphPatterns")
+ args("--pattern")
args('^.*\\.xml$')
}
Modified: trunk/foray/foray-pdf/build.gradle
===================================================================
--- trunk/foray/foray-pdf/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-pdf/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,31 +1,31 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-pdf'
+description = "foray-pdf"
dependencies {
- api libs.batikAwtUtil
+ api libs.batik.awt.util
- api libs.axsl.constants
- api libs.axsl.pdf
- api libs.axsl.primitive
- api libs.axsl.font
- api libs.axsl.graphic
- api libs.axsl.orthography
- api libs.axsl.ps
- implementation libs.axsl.constants
- api libs.axsl.value
+ api libs.axsl.constants
+ api libs.axsl.pdf
+ api libs.axsl.primitive
+ api libs.axsl.font
+ api libs.axsl.graphic
+ api libs.axsl.orthography
+ api libs.axsl.ps
+ implementation libs.axsl.constants
+ api libs.axsl.value
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
- implementation (project(':foray-pdf-core'))
- implementation (project(":foray-ps-data"))
+ api project(":foray-common")
+ implementation project(":foray-primitive")
+ implementation project(":foray-pdf-core")
+ implementation project(":foray-ps-data")
- testImplementation (project(':foray-font'))
- testImplementation (project(':foray-ps'))
+ testImplementation project(":foray-font")
+ testImplementation project(":foray-ps")
}
javadoc {
Modified: trunk/foray/foray-primitive/build.gradle
===================================================================
--- trunk/foray/foray-primitive/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-primitive/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,14 +1,14 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
}
-description = 'foray-primitive'
+description = "foray-primitive"
dependencies {
- implementation libs.commonsIo
- api libs.axsl.constants
- api libs.axsl.primitive
+ implementation libs.commons.io
+ api libs.axsl.constants
+ api libs.axsl.primitive
}
javadoc {
Modified: trunk/foray/foray-ps/build.gradle
===================================================================
--- trunk/foray/foray-ps/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-ps/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,21 +1,21 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-ps'
+description = "foray-ps"
dependencies {
- implementation libs.commonsCli
+ implementation libs.commons.cli
- api libs.axsl.constants
- api libs.axsl.primitive
- api libs.axsl.ps
+ api libs.axsl.constants
+ api libs.axsl.primitive
+ api libs.axsl.ps
- implementation (project(':foray-common'))
- implementation (project(':foray-primitive'))
- implementation (project(':foray-ps-data'))
+ implementation project(":foray-common")
+ implementation project(":foray-primitive")
+ implementation project(":foray-ps-data")
}
Modified: trunk/foray/foray-ps-data/build.gradle
===================================================================
--- trunk/foray/foray-ps-data/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-ps-data/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,20 +1,20 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-ps-data'
+description = "foray-ps-data"
dependencies {
- implementation libs.commonsCli
+ implementation libs.commons.cli
- api libs.axsl.ps
+ api libs.axsl.ps
- implementation (project(':foray-common'))
- implementation (project(':foray-primitive'))
+ implementation project(":foray-common")
+ implementation project(":foray-primitive")
- testImplementation libs.commonsIo
+ testImplementation libs.commons.io
}
javadoc {
Modified: trunk/foray/foray-render/build.gradle
===================================================================
--- trunk/foray/foray-render/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-render/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,30 +1,30 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
}
-description = 'foray-render'
+description = "foray-render"
dependencies {
- implementation libs.svg.lib
+ implementation libs.svg.dom
- api libs.axsl.constants
- implementation libs.axsl.primitive
- api libs.axsl.output
- api libs.axsl.font
- api libs.axsl.pdf
- api libs.axsl.galley
- api libs.axsl.value
- api libs.axsl.graphic
- implementation libs.axsl.orthography
- api libs.axsl.ps
+ api libs.axsl.constants
+ implementation libs.axsl.primitive
+ api libs.axsl.output
+ api libs.axsl.font
+ api libs.axsl.pdf
+ api libs.axsl.galley
+ api libs.axsl.value
+ api libs.axsl.graphic
+ implementation libs.axsl.orthography
+ api libs.axsl.ps
/* TODO: Replace this dependency on batik-anim, used for parsing SVGDocument, with something more lightweight. */
- implementation libs.batikAnim
+ implementation libs.batik.anim
- implementation (project(':foray-common'))
- implementation (project(':foray-primitive'))
- api (project(':foray-output'))
- api (project(':foray-ps-data'))
+ implementation project(":foray-common")
+ implementation project(":foray-primitive")
+ api project(":foray-output")
+ api project(":foray-ps-data")
}
javadoc {
Modified: trunk/foray/foray-xml/build.gradle
===================================================================
--- trunk/foray/foray-xml/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-xml/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,23 +1,23 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-xml'
+description = "foray-xml"
dependencies {
- implementation libs.commonsCli
- implementation libs.xmlResolver
- implementation libs.xmlSchemaCore
+ implementation libs.commons.cli
+ implementation libs.xml.resolver
+ implementation libs.xmlschema.core
/* The Xerces parser is used because it handles numeric character references correctly, while the standard Java
parser currently does not. */
- implementation libs.xerces2JImpl
- api libs.batikDom
- api libs.mathml.lib
+ implementation libs.xerces2J
+ api libs.batik.dom
+ api libs.mathml.dom
- implementation (project(':foray-common'))
- implementation (project(':foray-primitive'))
+ implementation project(":foray-common")
+ implementation project(":foray-primitive")
}
javadoc {
Modified: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/foray-zz-attic/build.gradle 2025-06-26 12:31:00 UTC (rev 13873)
@@ -1,23 +1,23 @@
plugins {
- id 'foray.library-conventions'
- id 'foray.test-conventions'
- id 'foray.logging-conventions'
+ id "foray.library-conventions"
+ id "foray.test-conventions"
+ id "foray.logging-conventions"
}
-description = 'foray-zz-attic'
+description = "foray-zz-attic"
dependencies {
- implementation libs.commonsIo
- api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.2')
- implementation libs.icu4j
+ implementation libs.commons.io
+ api (group: "jakarta.activation", name: "jakarta.activation-api", version: "1.2.2")
+ implementation libs.icu4j
- api libs.axsl.constants
- implementation libs.axsl.primitive
+ api libs.axsl.constants
+ implementation libs.axsl.primitive
- api (project(':foray-common'))
- implementation (project(':foray-primitive'))
- api (project(':foray-orthography'))
- testImplementation (project(':foray-orthography').sourceSets.test.output)
+ api project(":foray-common")
+ implementation project(":foray-primitive")
+ api project(":foray-orthography")
+ testImplementation project(":foray-orthography").sourceSets.test.output
}
javadoc {
Modified: trunk/foray/gradle/libs.versions.toml
===================================================================
--- trunk/foray/gradle/libs.versions.toml 2025-06-25 21:51:29 UTC (rev 13872)
+++ trunk/foray/gradle/libs.versions.toml 2025-06-26 12:31:00 UTC (rev 13873)
@@ -76,59 +76,58 @@
[libraries]
-svg-lib = { group = "org.axsl.org.w3c.dom.svg", name = "svg-dom-java", version.ref = "svgDom" }
-mathml-lib = { group = "org.axsl.org.w3c.dom.mathml", name = "mathml-dom-java", version.ref = "mathMlDom" }
+svg-dom = { group = "org.axsl.org.w3c.dom.svg", name = "svg-dom-java", version.ref = "svgDom" }
+mathml-dom = { group = "org.axsl.org.w3c.dom.mathml", name = "mathml-dom-java", version.ref = "mathMlDom" }
-axsl-areatree = { group = "org.axsl", name = "axsl-areatree", version.ref = "axsl" }
-axsl-constants = { group = "org.axsl", name = "axsl-constants", version.ref = "axsl" }
-axsl-content = { group = "org.axsl", name = "axsl-content", version.ref = "axsl" }
-axsl-context = { group = "org.axsl", name = "axsl-context", version.ref = "axsl" }
-axsl-font = { group = "org.axsl", name = "axsl-font", version.ref = "axsl" }
-axsl-fotree = { group = "org.axsl", name = "axsl-fotree", version.ref = "axsl" }
-axsl-galley = { group = "org.axsl", name = "axsl-galley", version.ref = "axsl" }
-axsl-graphic = { group = "org.axsl", name = "axsl-graphic", version.ref = "axsl" }
-axsl-i18n = { group = "org.axsl", name = "axsl-i18n", version.ref = "axsl" }
-axsl-kp-model = { group = "org.axsl", name = "axsl-kp-model", version.ref = "axsl" }
-axsl-layout = { group = "org.axsl", name = "axsl-layout", version.ref = "axsl" }
-axsl-linebreak = { group = "org.axsl", name = "axsl-linebreak", version.ref = "axsl" }
-axsl-mif = { group = "org.axsl", name = "axsl-mif", version.ref = "axsl" }
-axsl-orthography = { group = "org.axsl", name = "axsl-orthography", version.ref = "axsl" }
-axsl-output = { group = "org.axsl", name = "axsl-output", version.ref = "axsl" }
-axsl-pdf = { group = "org.axsl", name = "axsl-pdf", version.ref = "axsl" }
-axsl-primitive = { group = "org.axsl", name = "axsl-primitive", version.ref = "axsl" }
-axsl-ps = { group = "org.axsl", name = "axsl-ps", version.ref = "axsl" }
-axsl-speech = { group = "org.axsl", name = "axsl-speech", version.ref = "axsl" }
-axsl-value = { group = "org.axsl", name = "axsl-value", version.ref = "axsl" }
+axsl-areatree = { group = "org.axsl", name = "axsl-areatree", version.ref = "axsl" }
+axsl-constants = { group = "org.axsl", name = "axsl-constants", version.ref = "axsl" }
+axsl-content = { group = "org.axsl", name = "axsl-content", version.ref = "axsl" }
+axsl-context = { group = "org.axsl", name = "axsl-context", version.ref = "axsl" }
+axsl-font = { group = "org.axsl", name = "axsl-font", version.ref = "axsl" }
+axsl-fotree = { group = "org.axsl", name = "axsl-fotree", version.ref = "axsl" }
+axsl-galley = { group = "org.axsl", name = "axsl-galley", version.ref = "axsl" }
+axsl-graphic = { group = "org.axsl", name = "axsl-graphic", version.ref = "axsl" }
+axsl-i18n = { group = "org.axsl", name = "axsl-i18n", version.ref = "axsl" }
+axsl-kp-model = { group = "org.axsl", name = "axsl-kp-model", version.ref = "axsl" }
+axsl-layout = { group = "org.axsl", name = "axsl-layout", version.ref = "axsl" }
+axsl-linebreak = { group = "org.axsl", name = "axsl-linebreak", version.ref = "axsl" }
+axsl-mif = { group = "org.axsl", name = "axsl-mif", version.ref = "axsl" }
+axsl-orthography = { group = "org.axsl", name = "axsl-orthography", version.ref = "axsl" }
+axsl-output = { group = "org.axsl", name = "axsl-output", version.ref = "axsl" }
+axsl-pdf = { group = "org.axsl", name = "axsl-pdf", version.ref = "axsl" }
+axsl-primitive = { group = "org.axsl", name = "axsl-primitive", version.ref = "axsl" }
+axsl-ps = { group = "org.axsl", name = "axsl-ps", version.ref = "axsl" }
+axsl-speech = { group = "org.axsl", name = "axsl-speech", version.ref = "axsl" }
+axsl-value = { group = "org.axsl", name = "axsl-value", version.ref = "axsl" }
-slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
-commonsIo = { group = "commons-io", name = "commons-io", version.ref = "commonsIo" }
-commonsCli = { group = "commons-cli", name = "commons-cli", version.ref = "commonsCli" }
-commonsDiscovery = { group = "commons-discovery", name = "commons-discovery", version.ref = "commonsDiscovery" }
-xmlResolver = { group = "xml-resolver", name = "xml-resolver", version.ref = "xmlResolver" }
-xmlSchemaCore = { group = "org.apache.ws.xmlschema", name = "xmlschema-core", version.ref = "xmlSchemaCore" }
-xerces2JImpl = { group = "xerces", name = "xercesImpl", version.ref = "xerces2J" }
-servletApi = { group = "javax.servlet", name = "javax.servlet-api", version.ref = "servletApi" }
-ant = { group = "org.apache.ant", name = "ant", version.ref = "ant" }
-icu4j = { group = "com.ibm.icu", name = "icu4j", version.ref = "icu4j" }
-xmlgraphicsCommons = { group = "org.apache.xmlgraphics", name = "xmlgraphics-commons", version.ref = "xmlgraphicsCommons" }
-batikBridge = { group = "org.apache.xmlgraphics", name = "batik-bridge", version.ref = "batik" }
-batikGvt = { group = "org.apache.xmlgraphics", name = "batik-gvt", version.ref = "batik" }
-batikParser = { group = "org.apache.xmlgraphics", name = "batik-parser", version.ref = "batik" }
-batikTranscoder = { group = "org.apache.xmlgraphics", name = "batik-transcoder", version.ref = "batik" }
-batikAnim = { group = "org.apache.xmlgraphics", name = "batik-anim", version.ref = "batik" }
-batikDom = { group = "org.apache.xmlgraphics", name = "batik-dom", version.ref = "batik" }
-batikUtil = { group = "org.apache.xmlgraphics", name = "batik-util", version.ref = "batik" }
-batikAwtUtil = { group = "org.apache.xmlgraphics", name = "batik-awt-util", version.ref = "batik" }
-#jeuclid = { group = "net.sourceforge.jeuclid", name = "jeuclid-core", version.ref = "jeuclid" }
-jeuclid = { group = "de.rototor.jeuclid", name = "jeuclid-core", version.ref = "jeuclid" }
+slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+commons-io = { group = "commons-io", name = "commons-io", version.ref = "commonsIo" }
+commons-cli = { group = "commons-cli", name = "commons-cli", version.ref = "commonsCli" }
+commons-discovery = { group = "commons-discovery", name = "commons-discovery", version.ref = "commonsDiscovery" }
+xml-resolver = { group = "xml-resolver", name = "xml-resolver", version.ref = "xmlResolver" }
+xmlschema-core = { group = "org.apache.ws.xmlschema", name = "xmlschema-core", version.ref = "xmlSchemaCore" }
+xerces2J = { group = "xerces", name = "xercesImpl", version.ref = "xerces2J" }
+servlet-api = { group = "javax.servlet", name = "javax.servlet-api", version.ref = "servletApi" }
+ant = { group = "org.apache.ant", name = "ant", version.ref = "ant" }
+icu4j = { group = "com.ibm.icu", name = "icu4j", version.ref = "icu4j" }
+xmlgraphics-commons = { group = "org.apache.xmlgraphics", name = "xmlgraphics-commons", version.ref = "xmlgraphicsCommons" }
+batik-bridge = { group = "org.apache.xmlgraphics", name = "batik-bridge", version.ref = "batik" }
+batik-gvt = { group = "org.apache.xmlgraphics", name = "batik-gvt", version.ref = "batik" }
+batik-parser = { group = "org.apache.xmlgraphics", name = "batik-parser", version.ref = "batik" }
+batik-transcoder = { group = "org.apache.xmlgraphics", name = "batik-transcoder", version.ref = "batik" }
+batik-anim = { group = "org.apache.xmlgraphics", name = "batik-anim", version.ref = "batik" }
+batik-dom = { group = "org.apache.xmlgraphics", name = "batik-dom", version.ref = "batik" }
+batik-util = { group = "org.apache.xmlgraphics", name = "batik-util", version.ref = "batik" }
+batik-awt-util = { group = "org.apache.xmlgraphics", name = "batik-awt-util", version.ref = "batik" }
+jeuclid = { group = "de.rototor.jeuclid", name = "jeuclid-core", version.ref = "jeuclid" }
-checkerFramework = { group = "org.checkerframework", name = "checker", version.ref = "checkerFramework" }
-checkerQual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerFramework" }
+checker-framework = { group = "org.checkerframework", name = "checker", version.ref = "checkerFramework" }
+checker-qual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerFramework" }
-junitBom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
-junitJupiter = { group = "org.junit.jupiter", name = "junit-jupiter" }
-junitPlatformLauncher = { group = "org.junit.platform", name = "junit-platform-launcher" }
+junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|