From e7e68c6ac217093fecd490ba05d9313dbc1cda66 Mon Sep 17 00:00:00 2001
From: DemchaAV <demchaav@gmail.com>
Date: Sun, 5 Jul 2026 12:00:53 +0100
Subject: [PATCH] build: pull the bundled fonts and emoji onto the test
 classpath as artifacts

The engine's visual / snapshot / emoji suites need the bundled Google fonts
and colour-emoji glyphs, which live in the sibling graph-compose-fonts /
graph-compose-emoji modules. Until now they were placed on the test classpath
by pointing <testResources> at ${project.basedir}/fonts|emoji/src/main/resources
directly. That source-path form is relative to the root module's basedir and
will not survive the 2.0 module split, where render backends and templates sit
at other depths.

Depend on the published graph-compose-fonts:1.0.0 and graph-compose-emoji:1.0.0
at test scope instead. The artifacts package the same src/main/resources layout,
so classpath lookups are unchanged; test scope is not transitive, so the engine's
own published jar stays fonts-free. The two source-path <testResource> entries
and the now-moot fonts/**/emoji/** tests-jar excludes are removed (nothing is
copied into test-classes any more, so the tests-jar naturally carries only the
engine's own fixtures for the benchmarks module).

Verified: `./mvnw clean verify -pl .` green (clean-built, so fonts/emoji come
only from the artifacts); the aggregator reactor builds fonts and emoji before
the root and succeeds. graph-compose-fonts/-emoji 1.0.0 are on Central and match
the in-repo source, so a fresh CI build resolves them without a bootstrap step.
---
 pom.xml | 87 +++++++++++++++++++++++++++------------------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3650e6d6..b6b2b547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,12 @@
         <mockito.version>5.23.0</mockito.version>
         <byteBuddy.version>1.18.10</byteBuddy.version>
 
+        <!-- Bundled fonts / emoji, pulled in at test scope only. Pinned to the
+             independent 1.0.0 line (not bumped in engine lockstep); keep in step
+             with bundle/pom.xml's graphcompose.fonts.version. -->
+        <graphcompose.fonts.version>1.0.0</graphcompose.fonts.version>
+        <graphcompose.emoji.version>1.0.0</graphcompose.emoji.version>
+
         <!-- Build plugins -->
         <central.publishing.plugin.version>0.11.0</central.publishing.plugin.version>
         <maven.compiler.plugin.version>3.15.0</maven.compiler.plugin.version>
@@ -212,15 +218,27 @@
 
         <!-- Test dependencies -->
         <!--
-            The bundled Google fonts (graph-compose-fonts) are NOT a dependency
-            of the engine — not even at test scope. The engine's visual /
-            snapshot suite renders with them, but they are placed on the TEST
-            classpath directly from the sibling module's source via the
-            <testResources> entry in <build> below. This keeps the engine fully
-            decoupled from the fonts ARTIFACT (no Maven coordinate to resolve, so
-            an engine-only build never needs the fonts jar published or installed
-            first), while still exercising the real font binaries.
+            The bundled Google fonts and colour-emoji glyphs live in the sibling
+            graph-compose-fonts / graph-compose-emoji modules and are pulled in at
+            TEST scope so the engine's visual / snapshot / emoji suites render with
+            the real binaries. Test scope is not transitive, so the engine's own
+            published jar stays fonts-free — an engine consumer never drags these
+            in. A reactor build satisfies them from the just-built siblings; a
+            standalone `-pl .` build resolves the published 1.0.0 artifacts.
         -->
+        <dependency>
+            <groupId>io.github.demchaav</groupId>
+            <artifactId>graph-compose-fonts</artifactId>
+            <version>${graphcompose.fonts.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.demchaav</groupId>
+            <artifactId>graph-compose-emoji</artifactId>
+            <version>${graphcompose.emoji.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -288,33 +306,16 @@
 
     <build>
         <testResources>
-            <!-- Default test resources. -->
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
             <!--
-                Bundled Google fonts live in the sibling graph-compose-fonts
-                module since v1.8.0. The engine's visual / snapshot suite renders
-                with them, so put that module's resources on the TEST classpath
-                directly from source. This decouples the engine build from the
-                fonts ARTIFACT (no Maven dependency to resolve, so no CI/local
-                bootstrap is needed) while still exercising the real binaries.
-                Test-only: it never reaches the main jar (built from
-                src/main/resources) and is excluded from the tests-jar below.
+                Default test resources only. The bundled Google fonts and
+                colour-emoji glyphs are no longer copied in from the sibling
+                source dirs — they reach the test classpath via the
+                graph-compose-fonts / graph-compose-emoji test-scope artifacts
+                (see <dependencies> above), which package the same
+                src/main/resources layout, so classpath lookups are unchanged.
             -->
             <testResource>
-                <directory>${project.basedir}/fonts/src/main/resources</directory>
-            </testResource>
-            <!--
-                Colour-emoji glyphs live in the sibling graph-compose-emoji module
-                (same arrangement as fonts above). EmojiLibrary resolves them from
-                the classpath, so the resolver suite reads that module's resources
-                directly from source — decoupling the engine build from the emoji
-                ARTIFACT (no Maven dependency to resolve). Test-only: never reaches
-                the main jar and is excluded from the tests-jar below.
-            -->
-            <testResource>
-                <directory>${project.basedir}/emoji/src/main/resources</directory>
+                <directory>src/test/resources</directory>
             </testResource>
         </testResources>
 
@@ -452,20 +453,14 @@
                         <goals>
                             <goal>test-jar</goal>
                         </goals>
-                        <configuration>
-                            <!--
-                                The bundled fonts are on the test classpath via
-                                <testResources> for the engine's own suite; keep
-                                them OUT of the tests-jar. The benchmarks module
-                                (the only consumer of this jar) gets fonts from
-                                the graph-compose-fonts artifact instead. The emoji
-                                glyphs follow the same rule.
-                            -->
-                            <excludes>
-                                <exclude>fonts/**</exclude>
-                                <exclude>emoji/**</exclude>
-                            </excludes>
-                        </configuration>
+                        <!--
+                            No <excludes> needed: the bundled fonts / emoji are no
+                            longer copied into test-classes (they come from the
+                            graph-compose-fonts / graph-compose-emoji test-scope
+                            artifacts), so the tests-jar naturally carries only the
+                            engine's own fixtures (e.g. com.demcha.mock) that the
+                            benchmarks module consumes.
+                        -->
                     </execution>
                 </executions>
             </plugin>