boom

Author: dwijnand

build.sbt

@@ -1,7 +1,7 @@
 // shadow sbt-scalajs' crossProject and CrossType from Scala.js 0.6.x
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
-crossScalaVersions in ThisBuild := Seq("2.12.8", "2.11.12")
+crossScalaVersions in ThisBuild := Seq("0.17.0-RC1", "2.12.8", "2.11.12")
 scalaVersion in ThisBuild := crossScalaVersions.value.head
 
 lazy val `scala-unboxed-option` = crossProject(JSPlatform, JVMPlatform).
@@ -18,6 +18,6 @@ lazy val `scala-unboxed-option` = crossProject(JSPlatform, JVMPlatform).
       "-encoding", "utf8"
     ),
 
-    libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.1" % "test",
+    libraryDependencies += "com.eed3si9n.verify" %%% "verify" % "0.1.0" % Test,
     scalacOptions in Test -= "-Xfatal-warnings"
   )

project/plugins.sbt

@@ -1,2 +1,3 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")

src/main/scala/uoption/package.scala

@@ -34,7 +34,7 @@ package object uoption {
   object USome {
     @inline // only for Scala.js?
     def apply[A](value: A): USome[A] = value match {
-      case value @ UNone      => value.wrap.asInstanceOf[USome[A]]
+      case value @ UNone      => (value.asInstanceOf[UNone.type]).wrap.asInstanceOf[USome[A]]
       case value: WrappedNone => value.wrap.asInstanceOf[USome[A]]
       case _                  => value.asInstanceOf[USome[A]]
     }

src/test/scala/uoption/test/UOptionTest.scala

@@ -3,12 +3,12 @@ package uoption.test
 // this import is the price to pay to use UOptions
 import uoption._
 
-import org.scalatest._
+import verify._
 
-class UOptionTest extends FunSuite {
+class UOptionTest extends BasicTestSuite {
   test("caveats ==") {
-    assert(USome(5) == 5)
-    assert(USome(USome(4)) == 4)
+    assert(USome(5) equals 5)
+    assert(USome(USome(4)) equals 4)
   }
 
   test("caveats isInstanceOf") {