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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scala 2.12.9 support #867

Merged
merged 12 commits into from Aug 21, 2019

Conversation

@gabro
Copy link
Member

commented Aug 15, 2019

Closes #856

This PR does three things:

  • Update Scalameta to v4.2.1 consequently adding support for Scala 2.12.9
  • Use Scala 2.12.9 on Metals itself reverted, we don't care about it for now
  • Update slow tests to use 2.12.9, except for Mill, see below

The last two points are not strictly necessary, but since we're at it...

Hopefully, the CI gods will assist us 馃檹

build.sbt Outdated
@@ -149,7 +149,7 @@ lazy val V = new {
// List of supported Scala versions in SemanticDB. Needs to be manually updated
// for every SemanticDB upgrade.
def supportedScalaVersions =
Seq(scala213, scala212) ++ deprecatedScalaVersions
Seq(scala213, scala212, "2.12.8") ++ deprecatedScalaVersions

This comment has been minimized.

Copy link
@gabro

gabro Aug 15, 2019

Author Member

At some point we will deprecate 2.12.8, maybe when 2.12.10 is out?

This comment has been minimized.

Copy link
@tgodzik

tgodzik Aug 15, 2019

Collaborator

I think that's a good idea. 2.12.10 should be released soon since they found some issues there.

@gabro gabro force-pushed the gabro:scala-2.12.9 branch from 5266a66 to b805e6c Aug 15, 2019
@gabro gabro requested review from tgodzik and olafurpg Aug 15, 2019
@tgodzik

This comment has been minimized.

Copy link
Collaborator

commented Aug 15, 2019

Note: Unresolved dependencies path:
INFO [warn] org.scalameta:semanticdb-scalac_2.12.7:4.2.1 (MetalsPlugin.scala#L61)
INFO [warn] +- default:cancel_2.12:1.1

We should most likely remove support for 2.12.7 and change the tests using that.

@tgodzik

This comment has been minimized.

Copy link
Collaborator

commented Aug 16, 2019

Looks like a similar issue to the tests failing on 2.13. However I did confirm that the completions work without any issue when running on the generated workspaces in target directory.

better-monadic-for 2.12.8

package a {
  object Main extends scala.AnyRef {
    def <init>() = {
      super.<init>();
      ()
    };
    Option("").foreach(((x$1: String) => x$1 match {
      case (x @ _) => {
        implicit <synthetic> <artifact> val x$implicit$1: String = x;
        implicitly[String].toCharArr_CURSOR_
      }
    }))
  }
}

better-monadic-for 2.12.9

package a {
  object Main extends scala.AnyRef {
    def <init>() = {
      super.<init>();
      ()
    };
    Option("").withFilter(((check$ifrefutable$1) => check$ifrefutable$1: @scala.unchecked match {
  case implicit0((x @ (_: String))) => true
  case _ => false
})).foreach(((x$1) => x$1: @scala.unchecked match {
      case implicit0((x @ (_: String))) => implicitly[String].toCharArr_CURSOR_
    }))
  }
}
@gabro gabro referenced this pull request Aug 20, 2019
@tgodzik

This comment has been minimized.

Copy link
Collaborator

commented Aug 20, 2019

I think the test are broken, but it works overall. Best that someone else checks that it works with the plugins and we ignore the tests. After I am back I can start looking both at these tests and the broken 2.13 ones.

@gabro gabro force-pushed the gabro:scala-2.12.9 branch from 77a2e6c to 70523cc Aug 20, 2019
@gabro gabro force-pushed the gabro:scala-2.12.9 branch from 70523cc to c9f78bb Aug 20, 2019
)
// FIXME(gabro): the tests don't pass with 2.12.9, although the plugins seem to work fine when
// tested manually
if (BuildInfo.scalaVersion != "2.12.9") {

This comment has been minimized.

Copy link
@gabro
@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 20, 2019

Mill tests are failing due to a strange error (I tried to reproduce it locally and it seems that mill.contrib.Bloop/install fails due to a missing .bloop directory)

Cross tests are failing due to changes in the Scaladoc in 2.12.7, which again is strange.

I'll investigate later.

@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 20, 2019

Cross tests are failing due to changes in the Scaladoc in 2.12.7, which again is strange.

Ok, it was an issue with the indexing of scala-library in tests, which I have fixed in 230d194

The only remaining issue should be the Mill test suite

gabro added 4 commits Aug 20, 2019
@gabro gabro force-pushed the gabro:scala-2.12.9 branch from a7f29b6 to f39fea3 Aug 20, 2019
@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 20, 2019

Ok, only the mill suite is failing, working on it!

@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 20, 2019

Aha, the Mill build is failing due to lihaoyi/mill#678.

I propose we merge by reverting the Mill tests to use 2.12.8 and updating them once a new Mill version is out.

gabro added 4 commits Aug 20, 2019
@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 21, 2019

The AppVeyor failure seems spurious. I think we can merge this

@gabro gabro merged commit 70fec4d into scalameta:master Aug 21, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
scalameta.metals Build #20190820.11 succeeded
Details
@gabro gabro deleted the gabro:scala-2.12.9 branch Aug 21, 2019
@sarahgerweck

This comment has been minimized.

Copy link

commented Aug 22, 2019

Any chance of a 0.7.1 release build that uses this?
I can't really push out Scala 2.12.9 until this is in place. 馃檷

@gabro

This comment has been minimized.

Copy link
Member Author

commented Aug 22, 2019

@sarahgerweck that鈥檚 the plan, but we鈥檙e still ironing out some issues with 2.12.9 support.
Hopefully by next week, but don鈥檛 take my word for it ^^

@sarahgerweck

This comment has been minimized.

Copy link

commented Aug 22, 2019

Thanks for the insight @gabro. 馃憤

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can鈥檛 perform that action at this time.