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

Make dotty compile with 2.12.3 #2827

Merged
merged 21 commits into from Aug 22, 2017
Merged

Conversation

felixmulder
Copy link
Contributor

@felixmulder felixmulder commented Jul 3, 2017

This PR makes dotty compile with 2.12.3

TODO

  • Fix warnings (discussed the Eta-expansion errors, we will not be fixing them)
  • Implement JFunctionX methods that were left with a UnsupportedOperationException
  • Remove dependency on JFunctionX/JProcedureX
  • Fix trait encoding for 2.12 compiled traits (@odersky, but @felixmulder will have a look as well)
  • Reimplement FunctionalInterfaces kept the interfaces instead
  • Fix scala2 library tests
  • Bump version number?

@felixmulder felixmulder added this to the 0.3 Tech Preview milestone Jul 3, 2017
@@ -461,7 +461,7 @@ object Build {

// get libraries onboard
libraryDependencies ++= Seq("com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
("org.scala-lang.modules" %% "scala-xml" % "1.0.1").withDottyCompat(),
"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
Copy link
Member

Choose a reason for hiding this comment

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

Until you change withDottyCompat, you can rewrite this to:

"org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6",

@felixmulder
Copy link
Contributor Author

@sjrd - you removed the BoxesRuntime hash methods in 2.12 :)

@sjrd
Copy link
Member

sjrd commented Jul 4, 2017

Apparently I also removed that very test from Scala 2.12, so it's indeed irrelevant.

@odersky
Copy link
Contributor

odersky commented Jul 9, 2017

It seems the error is that it does not find ## in ScalaRunTime.

@smarter
Copy link
Member

smarter commented Jul 9, 2017

There's multiple errors (see 01ff24f for some tests that fail at runtime due to some issues with the mixin encoding), but that's one of the issue yes, see scala/scala@cce7016 for what changed in Scalac (this commit only deprecated ScalaRunTime.hash but it got removed in a subsequent commit).

@odersky
Copy link
Contributor

odersky commented Aug 7, 2017

I fixed the mixin encoding problem that showed up in unittest_collection. I could not reproduce the LazyValsLong problem. @felixmulder can you take over?

@felixmulder
Copy link
Contributor Author

Thanks @odersky, we'll take it from here, enjoy your vacay! 🍹 🏖

@felixmulder felixmulder force-pushed the topic/goto-2.12 branch 2 times, most recently from 38b0674 to f745117 Compare August 9, 2017 15:05
@smarter smarter changed the title [WIP] Make dotty compile with 2.12.2 [WIP] Make dotty compile with 2.12.3 Aug 10, 2017
@felixmulder felixmulder changed the title [WIP] Make dotty compile with 2.12.3 Make dotty compile with 2.12.3 Aug 15, 2017
@felixmulder felixmulder force-pushed the topic/goto-2.12 branch 3 times, most recently from 1835fa2 to 81b95a6 Compare August 22, 2017 15:25
@felixmulder felixmulder merged commit b0d3861 into scala:master Aug 22, 2017
@felixmulder
Copy link
Contributor Author

Merging as @smarter approved in person 🎉

@@ -35,7 +35,7 @@ object ExposedValues extends AutoPlugin {

object Build {

val scalacVersion = "2.11.11" // Do not rename, this is grepped in bin/common.
val scalacVersion = "2.12.2" // Do not rename, this is grepped in bin/common.
Copy link

Choose a reason for hiding this comment

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

Maybe I'm missing something, but this series isn't updating bin/common for 2.12, is it intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It wasn't intentional,no. But, we are aware: #3026

If you think you can fix the ./bin/* scripts, then we'd be more than happy to accept a PR! :)

Copy link

Choose a reason for hiding this comment

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

Great, until now I hadn't even noticed that there is both ./bin and ./dist/bin ;)

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

5 participants