Skip to content

Merge 2.11 to 2.12 apr 22#5115

Merged
lrytz merged 10 commits intoscala:2.12.xfrom
lrytz:merge-2.11-to-2.12-apr-22
Apr 25, 2016
Merged

Merge 2.11 to 2.12 apr 22#5115
lrytz merged 10 commits intoscala:2.12.xfrom
lrytz:merge-2.11-to-2.12-apr-22

Conversation

@lrytz
Copy link
Member

@lrytz lrytz commented Apr 22, 2016

$ git log --decorate --oneline -1 2.11.x | cat
2dd311f (upstream/2.11.x, origin/2.11.x, 2.11.x) CI: hardcode java path in integrate/windows script
$ git log --decorate --oneline -1 2.12.x | cat
f55dd20 (HEAD -> 2.12.x, upstream/2.12.x, origin/2.12.x) CI: hardcode java path in integrate/windows script

$ export MB=$(git merge-base 2.12.x 2.11.x)

$ git checkout 2.12.x
$ git checkout -b merge-2.11-to-2.12-apr-22
Switched to a new branch 'merge-2.11-to-2.12-apr-22'

$ git log --graph --oneline --decorate $MB...2.11.x | cat
* 2dd311f (upstream/2.11.x, origin/2.11.x, 2.11.x) CI: hardcode java path in integrate/windows script
*   932162a Merge pull request #5113 from adriaanm/ci-win-java6
|\
| * 04904be CI: use java 6 for windows integration
|/
* 684c314 SI-9734 Narrow type when import REPL history (#5084)
* 956923a SI-9735 REPL prefer standard escapes for code text (#5086)
* 65a7dfe Updating README.md Eclipse version reference. (#5092)
* 23159d2 Automate Eclipse settings and update project files: (#5091)


$ git merge 23159d2 -X theirs

  manually fixed .classpath files to look exactly like in 2.11.x, except for versioned dependencies.
  see diff of src/eclipse 2.11 vs 2.12 here: https://gist.github.com/lrytz/0d325780428396bd1455f1f2ac9dcb2b


$ git merge 684c314

  no conflicts here

$ git merge 2dd311f -s ours

  the last two changes (04904be, 2dd311f) are 2.11-specific and should not go in 2.12

dragos and others added 10 commits April 20, 2016 15:58
- remove `M2_REPO`. All dependencies are picked up from `build/deps`
- add script to update an existing workspace directory with the required path variables
- add the default Scala library to several projects for better out-of-the-box experience. This means
  that changes in the scale-library project may not be visible in the other projects, but makes it
  way easier to get a working config. If you really need that, you probably know what you’re doing
  anyway.
When constructing code text for compilation, the REPL
should prefer standard escape sequences, in case unicode
escapes are disabled.
Under `-Yrepl-class-based`, imports from historical `$read`
instances must be singleton-typed so that path-dependent types
remain so.
CI: use java 6 for windows integration
@scala-jenkins scala-jenkins added this to the 2.12.0-M5 milestone Apr 22, 2016
@lrytz
Copy link
Member Author

lrytz commented Apr 25, 2016

the build status here is OK (the three merge commits built fine). review by @szeiger

@szeiger
Copy link
Contributor

szeiger commented Apr 25, 2016

LGTM

@lrytz lrytz merged commit 2c1d1ad into scala:2.12.x Apr 25, 2016
<classpathentry combineaccessrules="false" kind="src" path="/partest-extras"/>
<classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/>
<classpathentry kind="var" path="M2_REPO/org/scala-lang/modules/scala-xml_2.12.0-M2/1.0.5/scala-xml_2.12.0-M2-1.0.5.jar"/>
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0_M4-1.0.5.jar"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

My Eclipse installation complains about this. There is a scala-xml_2.12.0-M4-1.0.5.jar (not _M4) present in the build directory, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

@lrytz lrytz deleted the merge-2.11-to-2.12-apr-22 branch May 17, 2016 13:37
@adriaanm adriaanm added 2.12 and removed 2.12 labels Oct 29, 2016
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