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

[Sponsored] scala 2.12 #1703

Merged
merged 23 commits into from Jan 21, 2017

Conversation

3 participants
@sugakandrey
Contributor

sugakandrey commented Jan 7, 2017

Been testing it locally, everything but DocResolverSpec seems to be working for me on 2.12.0.

todo:

@@ -209,11 +209,11 @@ class SearchServiceSpec extends EnsimeSpec
}
"lucene index" should "not contain duplicates" in withSearchService { implicit service =>
import scala.collection.JavaConversions._

This comment has been minimized.

@fommil

fommil Jan 7, 2017

Contributor

argh, we should not have been using this in the first place

@fommil

fommil Jan 7, 2017

Contributor

argh, we should not have been using this in the first place

@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 7, 2017

Contributor

don't forget to add 2.12.0 (and .1 when scala-refactoring is available) to the .drone.yml build matrix

Contributor

fommil commented Jan 7, 2017

don't forget to add 2.12.0 (and .1 when scala-refactoring is available) to the .drone.yml build matrix

Show outdated Hide outdated project/EnsimeBuild.scala
@@ -154,7 +155,10 @@ object EnsimeBuild {
ensimeUnmanagedSourceArchives += (baseDirectory in ThisBuild).value / "openjdk-langtools/openjdk8-langtools-src.zip",
libraryDependencies ++= Seq(
"com.h2database" % "h2" % "1.4.193",
"com.typesafe.slick" %% "slick" % "3.1.1",
"com.typesafe.slick" %% "slick" % (scalaBinaryVersion.value match {

This comment has been minimized.

@dwijnand

dwijnand Jan 7, 2017

Member

Should use CrossVersion.partialVersion over scalaBinaryVersion for the community build, btw.

@dwijnand

dwijnand Jan 7, 2017

Member

Should use CrossVersion.partialVersion over scalaBinaryVersion for the community build, btw.

This comment has been minimized.

@fommil

fommil Jan 7, 2017

Contributor

yeah, we need to get back into that build. We're blocked on scala-refactoring, who are not in it. And probably scala-debugging too.

@fommil

fommil Jan 7, 2017

Contributor

yeah, we need to get back into that build. We're blocked on scala-refactoring, who are not in it. And probably scala-debugging too.

@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 7, 2017

Contributor

looks like a subtle regression has come in the actors, failing (through a dreaded timeout) on all the CIs

Contributor

fommil commented Jan 7, 2017

looks like a subtle regression has come in the actors, failing (through a dreaded timeout) on all the CIs

@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 8, 2017

Contributor

oh damn, sbt ensimeConfig is trying to resolve a 2.12 version of ensime. We can override the ensimeServerJars etc tasks to return an empty list of files. In fact, we should do that in CI anyway to reduce the binary dependency.

Contributor

fommil commented Jan 8, 2017

oh damn, sbt ensimeConfig is trying to resolve a 2.12 version of ensime. We can override the ensimeServerJars etc tasks to return an empty list of files. In fact, we should do that in CI anyway to reduce the binary dependency.

@@ -257,7 +257,7 @@ trait RichCompilerControl extends CompilerControl with RefactoringControl with C
case SourceFileInfo(ac @ ArchiveFile(a, e), None, Some(contentsIn)) => new BatchSourceFile(
new VirtualFile(ac.fullPath), contentsIn.readString()(charset).toCharArray
)
case _ => throw new IllegalArgumentException(s"Invalid contents of SourceFileInfo parameter: $file.")

This comment has been minimized.

@fommil

fommil Jan 20, 2017

Contributor

yeah, this is bad domain modelling. We should really update the core classes at some point.

@fommil

fommil Jan 20, 2017

Contributor

yeah, this is bad domain modelling. We should really update the core classes at some point.

This comment has been minimized.

@sugakandrey

sugakandrey Jan 20, 2017

Contributor

yeah, thats what I thought 👍

@sugakandrey

sugakandrey Jan 20, 2017

Contributor

yeah, thats what I thought 👍

@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 20, 2017

Contributor

interesting, scalacheck found a bug in the bitset converter

[info]   TestFailedException was thrown during property evaluation.
[info]     Message: -9223372036854775808 did not equal 9223372036854775808
[info]     Location: (BigIntConvertorSpec.scala:51)
[info]     Occurred when passed generated values (
[info]       arg0 = 9223372036854775808
[info]     )

reproduce with

  it should "round-trip a troublesome number" in {
    val trouble = BigInt("9223372036854775808")
    fromBitSet(toBitSet(trouble)) shouldBe trouble
  }
Contributor

fommil commented Jan 20, 2017

interesting, scalacheck found a bug in the bitset converter

[info]   TestFailedException was thrown during property evaluation.
[info]     Message: -9223372036854775808 did not equal 9223372036854775808
[info]     Location: (BigIntConvertorSpec.scala:51)
[info]     Occurred when passed generated values (
[info]       arg0 = 9223372036854775808
[info]     )

reproduce with

  it should "round-trip a troublesome number" in {
    val trouble = BigInt("9223372036854775808")
    fromBitSet(toBitSet(trouble)) shouldBe trouble
  }
*
* ''Note: This library is considered experimental and should not be used unless you know what you are doing.''
*/
object ZipArchive {

This comment has been minimized.

@fommil

fommil Jan 20, 2017

Contributor

this might be added upstream scala/scala#5592

@fommil

fommil Jan 20, 2017

Contributor

this might be added upstream scala/scala#5592

@@ -55,7 +55,8 @@ object EnsimeBuild {
"org.apache.lucene" % "lucene-core" % luceneVersion
),
updateOptions := updateOptions.value.withCachedResolution(true)
updateOptions := updateOptions.value.withCachedResolution(true),
resolvers += Resolver.sonatypeRepo("snapshots")

This comment has been minimized.

@fommil

fommil Jan 20, 2017

Contributor

ouch, for scala-refactoring? it would be good to hold off until they have a final release

@fommil

fommil Jan 20, 2017

Contributor

ouch, for scala-refactoring? it would be good to hold off until they have a final release

This comment has been minimized.

@sugakandrey

sugakandrey Jan 20, 2017

Contributor

Yes, this is to get scala-refactoring-2.12.0 snapshot.

@sugakandrey

sugakandrey Jan 20, 2017

Contributor

Yes, this is to get scala-refactoring-2.12.0 snapshot.

@fommil fommil changed the title from [WIP] 2.12 preparations to 2.12.0 support (not 2.12.1... yet) Jan 21, 2017

@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 21, 2017

Contributor

transients in 2.12 build. I just want to get this merged - I'll do a manual release if it fails on CI - 2.12.1 coming soon!

Contributor

fommil commented Jan 21, 2017

transients in 2.12 build. I just want to get this merged - I'll do a manual release if it fails on CI - 2.12.1 coming soon!

@fommil fommil merged commit bf91bac into ensime:2.0 Jan 21, 2017

1 of 4 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/drone/pr this build is pending
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
licence/cla Contributor License Agreement is signed.
Details
@fommil

This comment has been minimized.

Show comment
Hide comment
@fommil

fommil Jan 21, 2017

Contributor

@sugakandrey you deserve a bloody good drink after that 😺 well done!

Contributor

fommil commented Jan 21, 2017

@sugakandrey you deserve a bloody good drink after that 😺 well done!

sugakandrey added a commit to sugakandrey/ensime-server that referenced this pull request Jan 25, 2017

Merge branch '2.0' into 2.0-graph
* 2.0:
  remove superflous test
  scala 2.12.1 support
  fix BasicWorkflow DocSig assertion (#1707)
  2.12.0 support (not 2.12.1... yet) (#1703)
  aggressive timeouts in tests (#1704)
  Add EnsimeProject for .ensime v2 format (#1693)
  no need for mkdir /root/.ssh in drone build
  bump headers (#1701)

@fommil fommil changed the title from 2.12.0 support (not 2.12.1... yet) to [Sponsored] 2.12.0 support (not 2.12.1... yet) Jul 7, 2017

@fommil fommil added this to Completed in Sponsorship Jul 19, 2017

@fommil fommil changed the title from [Sponsored] 2.12.0 support (not 2.12.1... yet) to [Sponsored] 2.12 support Jul 19, 2017

@fommil fommil changed the title from [Sponsored] 2.12 support to [Sponsored] scala 2.12 support Jul 19, 2017

@fommil fommil changed the title from [Sponsored] scala 2.12 support to [Sponsored] scala 2.12 Jul 19, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment