stevedlawrence commented on code in PR #117:
URL: https://github.com/apache/daffodil-sbt/pull/117#discussion_r2246446984
##########
src/main/scala/org/apache/daffodil/DaffodilPlugin.scala:
##########
@@ -290,9 +295,12 @@ object DaffodilPlugin extends AutoPlugin {
*/
libraryDependencies ++= {
if (daffodilBuildsLayer.value) {
- Seq(
- "org.apache.daffodil" %% "daffodil-runtime1-layers" %
daffodilVersion.value % "provided"
+ val charsetDep = Map(
+ ">=4.0.0 " -> "org.apache.daffodil" % "daffodil-core_3" %
daffodilVersion.value % "provided",
+ "=3.11.0 " -> "org.apache.daffodil" %
"daffodil-runtime1-layers_2.13" % daffodilVersion.value % "provided",
+ "<=3.10.0 " -> "org.apache.daffodil" %
"daffodil-runtime1-layers_2.12" % daffodilVersion.value % "provided"
)
+ filterVersions(daffodilVersion.value, charsetDep)
} else {
Seq()
}
Review Comment:
Note that if DAFFODIL-2994 is implemented to merge daffodil-udf into
daffodil-core, then the daffodilBuildsUDF case below will need a similar
change. Nothing to do for now, but something to keep in mind.
##########
src/main/scala/org/apache/daffodil/DaffodilPlugin.scala:
##########
@@ -279,7 +279,12 @@ 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_3" %
daffodilVersion.value % "provided",
+ "=3.11.0 " -> "org.apache.daffodil" % "daffodil-io_2.13" %
daffodilVersion.value % "provided",
+ "<=3.10.0 " -> "org.apache.daffodil" % "daffodil-io_2.12" %
daffodilVersion.value % "provided"
+ )
+ filterVersions(daffodilVersion.value, charsetDep)
Review Comment:
We don't technically need to hardcode the cross version in these
dependencies since these libraryDependencies can use `scalaVersion`. So this
could be simplified to something like this with %% using the scalaVersion,
which gets set appropriate based on daffodilVersion.
```scala
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)
```
Same idea for daffodilBuildsLayer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
