Skip to content

Removing launcher in favor of re-wrapping sbt/launcher module#1938

Merged
jsuereth merged 11 commits into0.13from
wip/launcher-as-module
Mar 26, 2015
Merged

Removing launcher in favor of re-wrapping sbt/launcher module#1938
jsuereth merged 11 commits into0.13from
wip/launcher-as-module

Conversation

@jsuereth
Copy link
Member

@jsuereth jsuereth commented Mar 25, 2015

Removes the launcher code from this project.

  • launcher-interface is depended on directly form maven-central
  • launcher-implementation is rebundled against the current version of sbt
  • All tests/dependencies updated appropriately.
  • sonatype-snapshots added as repository when we're using snapshot modules of launcher.
  • Bintray is now looked in first for all artifacts, as it's generally faster. We still look at
    maven central, because sbt-plugins on there do NOT sync to bintray correctly.

Review by @eed3si9n

jsuereth added 9 commits March 24, 2015 11:14
@jsuereth
Start using launcher interface from sbt/launcher module.
8e0862b
@jsuereth
Migrate to using the sbt/launcher module, rather than having the code…
9380ca0 
… embedded.

* Remove launch/* code/tests, as these are in the sbt/launcher project.
* Create a new project which will resolve launcher module from sonatype-snapshots,
  and repackage it for the currently building version of sbt.
* Remove ComponentManagerTest which was relying DIRECTLY on launcher classes.
  We'll need to reconfigure this shortly to enable the tests again.

Remaining TODOs -

* Update resolvers so people can find the launcher.
* Add ComponentManagerTest back.
* Re-publish the sbt-launch.jar in the location it used to be published.
@jsuereth
Add sonatype-snapshots resolver to the list for the launcher module s…
a77a6fb 
…napshots.
@jsuereth
Make bintray the default/first remote resoler, for faster resolution …
9261652 
…times.
@jsuereth
fix launcher re-publication.
a28663f 
* The rebundled sbt launcher is now pushed into the old location again.
@jsuereth
Remove unused proguard configuration.
004a557
@jsuereth
Fix repositories for dealing with snapshot modules.
a1b8102
@jsuereth
sbt-plugins don't copy over to bintray, so we still need to hit maven…
a27bb97 
… central, but last.
@jsuereth
Restore component manager test via stubs.
8feb3ec
@eed3si9n
Copy link
Member

eed3si9n commented Mar 25, 2015

+143 −3,423 < it's fun to see code getting reduced!
However, we should also make sure that potential contributors (and future selves) are not lost looking for piece of code that's introducing some behavior.

What do you think about adding a new section in https://github.com/sbt/website/blob/master/src/reference/03-Developers-Guide/00.md above "Plans for modularization" called "Currently modularized" or something like that and move sbt/serialization into it with a paragraph or blurb explaining what you did in this PR? Notes can just link to the dev guide for details.

eed3si9n
eed3si9n reviewed Mar 25, 2015
View reviewed changes
project/Dependencies.scala Outdated
Copy link
Member

@eed3si9n eed3si9n Mar 25, 2015

Choose a reason for hiding this comment

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

Why snapshot? Let's tag M1.

Copy link
Member Author

@jsuereth jsuereth Mar 25, 2015

Choose a reason for hiding this comment

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

Waiting for you to merge the last patch so I can do that.

@jsuereth
Copy link
Member Author

jsuereth commented Mar 25, 2015

@eed3si9n Sure, I can add that after this PR starts passing tests. Additionally, check out my PR to launcher, which explains (moderately) how to re-bundle launcher for a specific project.

eed3si9n
eed3si9n reviewed Mar 25, 2015
View reviewed changes
project/SbtLauncherPlugin.scala
Copy link
Member

@eed3si9n eed3si9n Mar 25, 2015

Choose a reason for hiding this comment

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

Is this plugin hard-coded to sbt usage? Can we make it general purpose and move it to sbt/launcher?

Copy link
Member Author

@jsuereth jsuereth Mar 25, 2015

Choose a reason for hiding this comment

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

eventaully. This is step one. Time-wise I'm way over budget for this week on this patch, as it already spiralled. Let's add that as a todo for later, rather than yak-shaving now.

@eed3si9n
Copy link
Member

eed3si9n commented Mar 25, 2015

This failure looks legit.

[info] [error] (*:checkPom) Written repositories did not match declared repositories.
[info] [error]  Written:
[info] [error]  sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots/
[info] [error]  Declared:
[info] [error]  jcenter: https://jcenter.bintray.com/
[info] [error]  sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots/
[info] [error] Total time: 0 s, completed Mar 25, 2015 4:29:06 PM
[error] x dependency-management / make-pom
[error]    {line 1}  Command failed: check-pom failed

@jsuereth
Copy link
Member Author

jsuereth commented Mar 26, 2015

@eed3si9n Failure is fixed.

@eed3si9n
Copy link
Member

eed3si9n commented Mar 26, 2015

Travis is green. Codacy thinks public method should be explicit return type even if it's project/*.scala :)
LGTM pending release note linking to dev guide. Merge at will.

jsuereth added a commit that referenced this pull request Mar 26, 2015
@jsuereth
Merge pull request #1938 from sbt/wip/launcher-as-module
74a9c04 
Removing launcher in favor of re-wrapping sbt/launcher module
@jsuereth jsuereth merged commit 74a9c04 into 0.13 Mar 26, 2015
@jsuereth jsuereth deleted the wip/launcher-as-module branch March 26, 2015 12:13
@eed3si9n
Copy link
Member

eed3si9n commented Mar 26, 2015

Does this fix #1820 and #1821?

@jsuereth
Copy link
Member Author

jsuereth commented Mar 26, 2015

not sure....

@indrajitr
Copy link
Member

indrajitr commented Mar 26, 2015

👍

@eed3si9n eed3si9n mentioned this pull request Jun 14, 2015
Merged
@eed3si9n eed3si9n mentioned this pull request Sep 21, 2015
Closed
@eed3si9n eed3si9n mentioned this pull request Dec 26, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jsuereth @eed3si9n @indrajitr