Skip to content

[SPARK-45342][BUILD] Remove the scala doc compilation option specific to Scala 2.12 #43129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 3 commits into from
Closed

[SPARK-45342][BUILD] Remove the scala doc compilation option specific to Scala 2.12 #43129

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73d1358
init
LuciferYang Sep 26, 2023
4fa3ea8
remove
LuciferYang Sep 26, 2023
2bb2a2f
Merge branch 'upmaster' into no-java-comments
LuciferYang Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ object SparkBuild extends PomBuild {
"-doc-title", "Spark " + version.value.replaceAll("-SNAPSHOT", "") + " ScalaDoc"
) ++ {
// Do not attempt to scaladoc javadoc comments under 2.12 since it can't handle inner classes
if (scalaBinaryVersion.value == "2.12") Seq("-no-java-comments") else Seq.empty
if (scalaBinaryVersion.value == "2.13") Seq("-no-java-comments") else Seq.empty
Copy link
Contributor Author

@LuciferYang LuciferYang Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srowen @easel I've found a leftover Scala 2.12 version check here, but when using the check method provided in #20042: sbt tags/publishLocal, I couldn't distinguish the scala doc built with or without -no-java-comments. I hope to get your help, how should we determine whether to keep the option -no-java-comments for Scala 2.13? Thanks ~

Copy link
Member

@srowen srowen Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should just remove this part, right? does not apply in Scala 2.13

Copy link
Contributor Author

@LuciferYang LuciferYang Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your help @srowen , but I found that there are errors when executing build/sbt doc -Phadoop-3 -Phadoop-cloud -Pmesos -Pyarn -Pkinesis-asl -Phive-thriftserver -Pspark-ganglia-lgpl -Pkubernetes -Phive -Pvolcano. Let me fix them first.

},

// disable Mima check for all modules,
Expand Down