Skip to content

Consolidate actual Scala module builds. #2

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

Merged
merged 2 commits into from
Jan 25, 2014
Merged

Conversation

adriaanm
Copy link
Contributor

Review by @jsuereth. Ran out of time to investigate further, but for now stuck on publishing. I guess I need to publish to bintray?

@adriaanm
Copy link
Contributor Author

The master branch in all my forks of scala modules have been updated to use this build. Will submit PRs as soon as this is merged and published. /cc @gkossakowski, @retronym

},

mappings in (Compile, packageBin) += {
(baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this needed? I think the resourceGenerators should ensure the properties file goes into the final jar..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, I verified this is needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Only needed when using OSGi apparently: https://github.com/sbt/sbt-osgi/blob/master/src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala#L41

We should open a ticket against sbt-osgi about not using the appropriate resources in Compile key. I think, even now, this is only accidentally fixing the issue. Doing a few inspect tree commands around the scala-xml build leads me to think the current architecture of sbt-osgi is leading to subtle, odd, issues in how to wire things like this.

Basically, this should NOT be needed. It represents a bug that is. You should a comment to that effect in this file and I'll try to follow up on a fix.

adriaanm added a commit that referenced this pull request Jan 25, 2014
Consolidate actual Scala module builds.
@adriaanm adriaanm merged commit 60c38ed into scala:master Jan 25, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants