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

Forward port "Handle source, docs artifacts correctly for Ivy [1.0.x]" + update modules #2478

Merged
merged 11 commits into from
Feb 25, 2016

Conversation

Duhemm
Copy link
Contributor

@Duhemm Duhemm commented Feb 24, 2016

This PR currently refers to a locally published version of incrementalcompiler, which includes both sbt/zinc#70 and sbt/zinc#71.

I'm thinking that maybe we should merge this PR in priority and then rebase all the forward port that were waiting for a release of incrementalcompiler or librarymanagement.

Note that this is not only adapting to changes. Because of the changes to the API of the incremental compiler I've had to make some other changes:

  • Created a new key compileOptions that produces a xsbti.compile.CompileOptions,
  • Created two new keys sourceTypes and docTypes that specify which artifacts must be considered source or doc artifacts.

@dansanduleac
Copy link
Contributor

Looks like you've replicated quite a bit of work already in #2475, which is supposed sbt/sbt's counterpart of sbt/librarymanagement#25 (the breaking changes in librarymanagement-0.1.0-M7), specifically the srcTypes / docTypes settings, and the CacheIvy changes. :)

Though, you should be aware that it's also necessary to set a default filter for UpdateConfiguration that excludes src/doc artifacts, since you only want the binaries, and subsequently inverts that filter when getting classifiers (see https://github.com/sbt/sbt/pull/2475/files#diff-6373e7f7122325e753b75fe1cc76ff5fR1268).

Would it be possible to rebase these changes on top of that PR so that we don't get any overlap?

@Duhemm
Copy link
Contributor Author

Duhemm commented Feb 24, 2016

@dansanduleac You're right. Maybe that it would be better to first merge #2475 and then rebase this one.

@Duhemm Duhemm force-pushed the wip/update-incrementalcompiler branch from 7e1d31b to 27d1d62 Compare February 24, 2016 15:47
@Duhemm Duhemm force-pushed the wip/update-incrementalcompiler branch from 27d1d62 to 20d0c41 Compare February 24, 2016 15:54
@Duhemm
Copy link
Contributor Author

Duhemm commented Feb 24, 2016

I have rebased this PR on #2475. The problem is that #2475 upgrades the dependency on librarymanagement to 0.1.0-M7, but incrementalcompiler still uses 0.1.0-M3.

This PR now includes the changes of #2475 plus the changes that will be required once a new release of incrementalcompiler is cut.

@dansanduleac
Copy link
Contributor

@Duhemm Thanks for rebasing. I see what's going on - all these subprojects are causing dependency hell.
Perhaps it makes sense for

  • a PR to update incrementalcompiler to use librarymanagement-0.1.0-M6 first, then
  • a PR here based off that, and only afterwards
  • upgrade incrementalcompiler to use 0.1.0-M7 & cut a new release
  • merge Handle source, docs artifacts correctly for Ivy [1.0.x] #2475 cleanly (since it's only necessary on top of librarymanagement-0.1.0-M7)

I suspect your changes fall into step (2) above.

@Duhemm Duhemm changed the title (WIP) Update to latest util, incrementalcompiler and librarymanagement Forward port "Handle source, docs artifacts correctly for Ivy [1.0.x]" + update modules Feb 24, 2016
@eed3si9n
Copy link
Member

https://travis-ci.org/sbt/sbt/jobs/111582958

Running dependency-management / make-pom
[error] x dependency-management / make-pom [PENDING]
[error]   Mark as passing to remove this failure.

[error] x dependency-management / pom-type
[error]    {line 1}  Command failed: checkPom failed

A bunch of failures here too - https://travis-ci.org/sbt/sbt/jobs/111583017

It has changed and will be re-enabled by changes that have not yet been
forward-ported from sbt 0.13.
@Duhemm Duhemm force-pushed the wip/update-incrementalcompiler branch from d06e34e to 5e16bba Compare February 25, 2016 06:14
eed3si9n added a commit that referenced this pull request Feb 25, 2016
Forward port "Handle source, docs artifacts correctly for Ivy [1.0.x]" + update modules
@eed3si9n eed3si9n merged commit e544756 into sbt:1.0.x Feb 25, 2016
@eed3si9n
Copy link
Member

Merged

dwijnand added a commit to dwijnand/sbt that referenced this pull request Apr 5, 2017
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.

None yet

3 participants