Merge pull request #993 from japgolly/topic/scala302

Upgrade to Scala 3.0.2

Author: japgolly

coreGeneric/src/main/scala-2/japgolly/scalajs/react/vdom/Attr.scala

@@ -63,22 +63,24 @@ object Attr {
       O.foreach(callback)(prepare(_)())
   }
 
-  trait EventCallback0 {
-    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
-      new EventCallback(fa => F.dispatchFn(fa))
-
+  trait EventCallback1 {
     implicit def reusableDispatch[F[_]](implicit F: Dispatch[F]): EventCallback[Reusable[F[Unit]]] =
       new EventCallback(fa => F.dispatchFn(fa))
   }
 
-  object EventCallback extends EventCallback0 {
-    import DefaultEffects.{Sync => D}
+  trait EventCallback2 extends EventCallback1 {
+    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
+      new EventCallback(fa => F.dispatchFn(fa))
+  }
 
-    implicit val defaultSync: EventCallback[D[Unit]] =
-      dispatch(D)
+  trait EventCallback3 extends EventCallback2 {
+    implicit lazy val reusableDefaultSync: EventCallback[Reusable[DefaultEffects.Sync[Unit]]] =
+      reusableDispatch(DefaultEffects.Sync)
+  }
 
-    implicit lazy val reusableDefaultSync: EventCallback[Reusable[D[Unit]]] =
-      reusableDispatch(D)
+  object EventCallback extends EventCallback3 {
+    implicit val defaultSync: EventCallback[DefaultEffects.Sync[Unit]] =
+      dispatch(DefaultEffects.Sync)
   }
 
   type EventHandler[E[+x <: dom.Node] <: facade.SyntheticEvent[x]] =

coreGeneric/src/main/scala-3/japgolly/scalajs/react/vdom/Attr.scala

@@ -79,22 +79,24 @@ object Attr {
       O.foreach(callback)(prepare(_)())
   }
 
-  trait EventCallback0 {
-    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
-      new EventCallback(fa => F.dispatchFn(fa))
-
+  trait EventCallback1 {
     implicit def reusableDispatch[F[_]](implicit F: Dispatch[F]): EventCallback[Reusable[F[Unit]]] =
       new EventCallback(fa => F.dispatchFn(fa))
   }
 
-  object EventCallback extends EventCallback0 {
-    import DefaultEffects.{Sync => D}
+  trait EventCallback2 extends EventCallback1 {
+    implicit def dispatch[F[_]](implicit F: Dispatch[F]): EventCallback[F[Unit]] =
+      new EventCallback(fa => F.dispatchFn(fa))
+  }
 
-    implicit val defaultSync: EventCallback[D[Unit]] =
-      dispatch(D)
+  trait EventCallback3 extends EventCallback2 {
+    implicit lazy val reusableDefaultSync: EventCallback[Reusable[DefaultEffects.Sync[Unit]]] =
+      reusableDispatch(DefaultEffects.Sync)
+  }
 
-    implicit lazy val reusableDefaultSync: EventCallback[Reusable[D[Unit]]] =
-      reusableDispatch(D)
+  object EventCallback extends EventCallback3 {
+    implicit val defaultSync: EventCallback[DefaultEffects.Sync[Unit]] =
+      dispatch(DefaultEffects.Sync)
   }
 
   type EventHandler[E[+x <: dom.Node] <: facade.SyntheticEvent[x]] =

project/Dependencies.scala

@@ -15,7 +15,7 @@ object Dependencies {
     val monocle2              = "2.1.0"
     val monocle3              = "3.1.0"
     val scala2                = "2.13.6"
-    val scala3                = "3.0.1"
+    val scala3                = "3.0.2"
     val scalaJsDom            = "1.2.0"
     val sourcecode            = "0.2.7"
 

tests/src/test/scala/japgolly/scalajs/react/core/vdom/ReactAttrTest.scala

@@ -3,25 +3,57 @@ package japgolly.scalajs.react.core.vdom
 import japgolly.scalajs.react._
 import japgolly.scalajs.react.vdom.html_<^._
 import scala.scalajs.js
+
+object ReactAttrTestSep {
+  import utest.compileError
+
+  val anything = VdomAttr[Any]("")
+  val intOnly = ^.colSpan
+  val stringOnly = ^.href
+  val style = ^.style
+  val mouse = ^.onMouseDown
+  val focus = ^.onFocus
+
+  def jsObj: js.Object = new js.Object()
+  def jsDict: js.Dictionary[String] = js.Dictionary.empty
+  val unit = ()
+  def callback = Callback.empty
+  def anyEH: ReactEvent => Callback = _ => callback
+  def mouseEH: ReactMouseEvent => Callback = _ => callback
+  def focusEH: ReactFocusEvent => Callback = _ => callback
+  def mouseInputEH: ReactMouseEventFromInput => Callback = _ => callback
+
+  def mouseEvent(): Unit = {
+    mouse --> callback
+    mouse ==> anyEH
+    mouse ==> mouseEH
+    mouse ==> mouseInputEH
+    compileError("mouse ==> focusEH")
+    compileError("mouse := \"\"")
+    compileError("mouse := 5")
+    compileError("mouse := jsObj")
+    compileError("mouse := jsDict")
+    compileError("mouse := unit").msg
+  }
+
+  def focusEvent(): Unit = {
+    focus --> callback
+    focus ==> anyEH
+    focus ==> focusEH
+    compileError("focus ==> mouseEH")
+    compileError("focus ==> mouseInputEH")
+    compileError("focus := \"\"")
+    compileError("focus := 5")
+    compileError("focus := jsObj")
+    compileError("focus := jsDict")
+    compileError("focus := unit").msg
+  }
+}
+
 import utest._
 
 object ReactAttrTest extends TestSuite {
-
-  private val anything = VdomAttr[Any]("")
-  private val intOnly = ^.colSpan
-  private val stringOnly = ^.href
-  private val style = ^.style
-  private val mouse = ^.onMouseDown
-  private val focus = ^.onFocus
-
-  private def jsObj: js.Object = new js.Object()
-  private def jsDict: js.Dictionary[String] = js.Dictionary.empty
-  private val unit = ()
-  private def callback = Callback.empty
-  private def anyEH: ReactEvent => Callback = _ => callback
-  private def mouseEH: ReactMouseEvent => Callback = _ => callback
-  private def focusEH: ReactFocusEvent => Callback = _ => callback
-  private def mouseInputEH: ReactMouseEventFromInput => Callback = _ => callback
+  import ReactAttrTestSep._
 
   override def tests = Tests {
 
@@ -58,34 +90,10 @@ object ReactAttrTest extends TestSuite {
         compileError("style := \"\"")
         compileError("style := unit").msg
       }
-
-      "mouseEvent" - {
-        mouse --> callback
-        mouse ==> anyEH
-        mouse ==> mouseEH
-        mouse ==> mouseInputEH
-        compileError("mouse ==> focusEH")
-        compileError("mouse := \"\"")
-        compileError("mouse := 5")
-        compileError("mouse := jsObj")
-        compileError("mouse := jsDict")
-        compileError("mouse := unit").msg
-      }
-
-      "focusEvent" - {
-        focus --> callback
-        focus ==> anyEH
-        focus ==> focusEH
-        compileError("focus ==> mouseEH")
-        compileError("focus ==> mouseInputEH")
-        compileError("focus := \"\"")
-        compileError("focus := 5")
-        compileError("focus := jsObj")
-        compileError("focus := jsDict")
-        compileError("focus := unit").msg
-      }
-
     }
 
+    "mouseEvent" - mouseEvent()
+    "focusEvent" - focusEvent()
+
   }
 }

tests/src/test/scala/japgolly/scalajs/react/extra/router/Router2Test.scala

@@ -12,8 +12,7 @@ import scala.annotation.nowarn
 import scala.scalajs.LinkingInfo.developmentMode
 import utest._
 
-object Router2Test extends TestSuite {
-
+object Router2TestRoutes {
   sealed trait Module
   case object ModuleRoot extends Module
   case object Module1 extends Module
@@ -143,8 +142,12 @@ object Router2Test extends TestSuite {
         .logToConsole
     }
   }
+}
 
-  // -------------------------------------------------------------------------------------------------------------------
+// ===================================================================================================================
+
+object Router2Test extends TestSuite {
+  import Router2TestRoutes._
 
   implicit def str2path(s: String): Path = Path(s)
   def htmlFor(r: Resolution[_]) = ReactDOMServer.renderToStaticMarkup(r.render())

tests/src/test/scala/japgolly/scalajs/react/extra/router/RouterP2Test.scala

@@ -12,7 +12,7 @@ import scala.annotation.nowarn
 import scala.scalajs.LinkingInfo.developmentMode
 import utest._
 
-object RouterP2Test extends TestSuite {
+object RouterP2TestRoutes {
   class Ctx(val int: Int) extends AnyVal
 
   sealed trait Module
@@ -146,8 +146,12 @@ object RouterP2Test extends TestSuite {
         .logToConsole
     }
   }
+}
 
-  // -------------------------------------------------------------------------------------------------------------------
+// ===================================================================================================================
+
+object RouterP2Test extends TestSuite {
+  import RouterP2TestRoutes._
 
   implicit def str2path(s: String): Path = Path(s)