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

mbeckerle pushed a commit to branch daf-2975
in repository https://gitbox.apache.org/repos/asf/daffodil.git

commit b558503ad59c27746dce5e4053c678b4049ffa6c
Author: Michael Beckerle <[email protected]>
AuthorDate: Wed Feb 26 22:49:11 2025 -0500

    Checkpoint - got past genjavadoc being unavail in scala 3
    
    But this is just all commented out for now.
---
 build.sbt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index fee1231ed..efed81936 100644
--- a/build.sbt
+++ b/build.sbt
@@ -84,8 +84,15 @@ lazy val io = Project("daffodil-io", file("daffodil-io"))
   .settings(commonSettings, usesMacros)
 
 lazy val runtime1 = Project("daffodil-runtime1", file("daffodil-runtime1"))
-  .enablePlugins(GenJavadocPlugin)
-  .settings(Dependencies.genjavadocVersion) // converts scaladoc to javadoc
+  // genjavadoc no longer works with Scala 3.
+  // We must investigate how to do cross-comp support if
+  // we continue to support scala 2.13 (which we should for now)
+  // The replacement is to use scaladoc with some options as it has
+  // supposedly enhanced to subsume genjavadoc behavior.
+  // Perhaps we can use the scala 3 compiler for this doc gen even
+  // when compiling for scala 2.13.
+  // .enablePlugins(GenJavadocPlugin)
+  // .settings(Dependencies.genjavadocVersion) // converts scaladoc to javadoc
   .dependsOn(
     io,
     lib % "test->test",
@@ -145,8 +152,8 @@ lazy val core = Project("daffodil-core", 
file("daffodil-core"))
   .settings(commonSettings)
 
 lazy val japi = Project("daffodil-japi", file("daffodil-japi"))
-  .enablePlugins(GenJavadocPlugin)
-  .settings(Dependencies.genjavadocVersion) // converts scaladoc to javadoc
+//  .enablePlugins(GenJavadocPlugin)
+//  .settings(Dependencies.genjavadocVersion) // converts scaladoc to javadoc
   .dependsOn(core, slf4jLogger % "test")
   .settings(commonSettings)
 
@@ -276,7 +283,7 @@ def buildScalacOptions(scalaVersion: String) = {
     s"-release:$minSupportedJavaVersion", // scala 2.12 can only do Java 8, 
regardless of this setting.
     "-feature",
     "-deprecation",
-    "-unchecked",
+    "-unchecked"
   )
 
   val scala212And213Options = Seq(

Reply via email to