Skip to content

Conversation

@soc
Copy link
Contributor

@soc soc commented Nov 19, 2015

This drops the dependency by integrating the bare minimum functionality
to keep things working.

@scala-jenkins scala-jenkins added this to the 2.12.0-M4 milestone Nov 19, 2015
@soc
Copy link
Contributor Author

soc commented Nov 19, 2015

@SethTisue Could you have a look regarding the build/ant/pom details?

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we drop the gratuitous string interpolation for vector.map(format).mkString("[", ", ", "]")?

@soc
Copy link
Contributor Author

soc commented Nov 19, 2015

@Ichoran Thanks for the feedback!

@SethTisue
Copy link
Member

@szeiger, you're neck-deep in ant and sbt lately, can you review that aspect?

@soc this looks very promising. did you diff the generated scaladoc for the standard library, before vs. after?

@soc
Copy link
Contributor Author

soc commented Nov 21, 2015

@SethTisue I diffed a smaller example of my own with all kinds of special characters, would be surprised if there were any differences considering the code is pretty much the same as before.

@SethTisue
Copy link
Member

I verified that library/index.js and library/lib/index.js are identical before and after the change. So this LGTM, but I leave the final merge to @szeiger. (I imagine Stefan might want to wait until we're off of Ant altogether, so marking this "on hold" for now.)

@soc
Copy link
Contributor Author

soc commented Feb 5, 2016

@SethTisue @szeiger What's the current status of the ant -> sbt migration?

@szeiger
Copy link
Contributor

szeiger commented Feb 5, 2016

Now that #4941 has been merged, I think an updated version on top of 2.12.x could be safely merged. The basics of the sbt build should be stable enough not to complicate merges too much in the future. Some tests and integration scripts still need to be ported to sbt (@SethTisue is working on this at the moment), so you'd still need to update both the sbt and the ant build.

@SethTisue
Copy link
Member

What's the current status of the ant -> sbt migration

I'm actively working on it. No fundamental obstacles remain afawk, just a parade of details to sort out. The umbrella ticket to watch is scala/scala-dev#45.

@SethTisue SethTisue modified the milestones: 2.12.0-M5, 2.12.0-M4 Feb 5, 2016
@soc
Copy link
Contributor Author

soc commented Apr 7, 2016

Sorry for the ping ... is there an estimated timeframe when the SBT build will be switched on, or promoted as the main way to build scala/scala?

@adriaanm
Copy link
Contributor

We hope to have this done in the next two weeks.

@adriaanm adriaanm added WIP and removed on-hold labels May 3, 2016
@lrytz
Copy link
Member

lrytz commented May 23, 2016

@soc there's no reason to hold this change back, even if we're still using the ant build on CI. could you rebase the patch?

Export-Package: *;version=${ver}
Import-Package: jline.*;resolution:=optional, \
org.apache.tools.ant.*;resolution:=optional, \
scala.util.parsing.*;version="${range;[====,====];@PARSER_COMBINATORS_VERSION@}";resolution:=optional, \
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a similar import spec in build.sbt that needs to be changed. This file is only used by ant.

@szeiger
Copy link
Contributor

szeiger commented May 25, 2016

Flushing the M5 queue on Monday. Please update until then if you want this to go into 2.12.0 (but this looks safe to put into a non-.0 release as well)

@adriaanm adriaanm modified the milestones: 2.12.0-RC1, 2.12.0-M5 Jun 3, 2016
@adriaanm adriaanm added this to the 2.12.1 milestone Jul 5, 2016
@adriaanm adriaanm removed this from the 2.12.0-RC1 milestone Jul 5, 2016
Also update a few example IDE files for Eclipse and IntelliJ.

This drops the dependency by integrating the bare minimum functionality
to keep things working.
@soc
Copy link
Contributor Author

soc commented Jul 22, 2016

@szeiger Updated! Could you have a look?

@szeiger
Copy link
Contributor

szeiger commented Jul 25, 2016

LGTM

@szeiger szeiger merged commit 1e7ce6e into scala:2.12.x Jul 25, 2016
@SethTisue
Copy link
Member

thanks, Simon! really nice to have this resolved

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.

8 participants