(daffodil-sbt) branch main updated: Fix layers/charset plugins to work with 4.0.0

[jadams]

This is an automated email from the ASF dual-hosted git repository.

jadams pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-sbt.git


The following commit(s) were added to refs/heads/main by this push:
     new 3e96a30  Fix layers/charset plugins to work with 4.0.0
3e96a30 is described below

commit 3e96a30925c7889383f497f1908e7a84827a87d9
Author: Josh Adams <jad...@owlcyberdefense.com>
AuthorDate: Thu Jul 31 17:24:39 2025 -0400

    Fix layers/charset plugins to work with 4.0.0
---
 src/main/scala/org/apache/daffodil/DaffodilPlugin.scala | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala 
b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
index 30d691d..ccd55d8 100644
--- a/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
+++ b/src/main/scala/org/apache/daffodil/DaffodilPlugin.scala
@@ -279,7 +279,11 @@ object DaffodilPlugin extends AutoPlugin {
      */
     libraryDependencies ++= {
       if (daffodilBuildsCharset.value) {
-        Seq("org.apache.daffodil" %% "daffodil-io" % daffodilVersion.value % 
"provided")
+        val charsetDep = Map(
+          ">=4.0.0 " -> "org.apache.daffodil" %% "daffodil-core" % 
daffodilVersion.value % "provided",
+          "<=3.11.0 " -> "org.apache.daffodil" %% "daffodil-io" % 
daffodilVersion.value % "provided"
+        )
+        filterVersions(daffodilVersion.value, charsetDep)
       } else {
         Seq()
       }
@@ -290,9 +294,11 @@ object DaffodilPlugin extends AutoPlugin {
      */
     libraryDependencies ++= {
       if (daffodilBuildsLayer.value) {
-        Seq(
-          "org.apache.daffodil" %% "daffodil-runtime1-layers" % 
daffodilVersion.value % "provided"
+        val layersDep = Map(
+          ">=4.0.0 " -> "org.apache.daffodil" %% "daffodil-core" % 
daffodilVersion.value % "provided",
+          "<=3.11.0 " -> "org.apache.daffodil" %% "daffodil-runtime1-layers" % 
daffodilVersion.value % "provided"
         )
+        filterVersions(daffodilVersion.value, layersDep)
       } else {
         Seq()
       }