Skip to content
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.

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

do not generate javadoc for tests #17528

Merged
merged 1 commit into from May 20, 2015
Merged

do not generate javadoc for tests #17528

merged 1 commit into from May 20, 2015

Conversation

rkuhn
Copy link
Contributor

@rkuhn rkuhn commented May 20, 2015

No description provided.

@rkuhn rkuhn mentioned this pull request May 20, 2015
@akka-ci akka-ci added the validating PR is currently being validated by Jenkins label May 20, 2015
@@ -313,7 +313,8 @@ object AkkaBuild extends Build {
// compile options
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
scalacOptions in Compile ++= (if (allWarnings) Seq("-deprecation") else Nil),
scalacOptions in Test := (scalacOptions in Test).value.filterNot(_ == "-Xlog-reflective-calls"),
scalacOptions in Test := (scalacOptions in Test).value.filterNot(opt =>
opt == "-Xlog-reflective-calls" || opt.contains("genjavadoc")),
Copy link
Member

Choose a reason for hiding this comment

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

alright, magic

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, not at all: we previously added the configuration that emits the synthetic Java sources to the Test configuration, now we don’t.

Copy link
Member

Choose a reason for hiding this comment

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

where do we add this opt to scalacOptions in the first place?
I can't find the string "genjavadoc" anywhere else than scalacOptions in Compile += "-P:genjavadoc:fabricateParams=true", but that can't be the thing.
Is it added by unidoc?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is in genjavadocExtraSettings, pulled in from project/Unidoc.scala.

@patriknw
Copy link
Member

LGTM, thanks

@akka-ci akka-ci added the tested PR that was successfully built and tested by Jenkins label May 20, 2015
@akka-ci
Copy link

akka-ci commented May 20, 2015

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://jenkins.akka.io/job/pr-validator-per-commit-jenkins/2701/

@akka-ci akka-ci removed the validating PR is currently being validated by Jenkins label May 20, 2015
patriknw added a commit that referenced this pull request May 20, 2015
@patriknw patriknw merged commit e16ea0b into master May 20, 2015
@patriknw patriknw deleted the wip-fix-javaunidoc-∂π branch May 20, 2015 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tested PR that was successfully built and tested by Jenkins
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants