Skip to content

Commit

Permalink
Add JS instances
Browse files Browse the repository at this point in the history
  • Loading branch information
japgolly committed Sep 19, 2018
1 parent 723efc8 commit 20f3c3e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
* `scala.collection.immutable.TreeSet`
* `scala.concurrent.duration.Duration`
* `scala.concurrent.duration.FiniteDuration`
* Add JS instances for:
* `org.scalajs.dom.Element`
* `scalajs.js.UndefOr`
* Upgrade all dependencies

# 1.0.2
Expand Down
12 changes: 7 additions & 5 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ object UnivEqBuild {
Lib.publicationSettings(ghProject)

object Ver {
final val Cats = "1.4.0"
final val MTest = "0.6.5"
final val Scala211 = "2.11.12"
final val Scala212 = "2.12.6"
final val Scalaz = "7.2.26"
final val Cats = "1.4.0"
final val MTest = "0.6.5"
final val Scala211 = "2.11.12"
final val Scala212 = "2.12.6"
final val Scalaz = "7.2.26"
final val ScalaJsDom = "0.9.6"
}

def scalacFlags = Seq(
Expand Down Expand Up @@ -106,6 +107,7 @@ object UnivEqBuild {
.configureCross(commonSettings, publicationSettings, utestSettings)
.bothConfigure(definesMacros)
.settings(moduleName := "univeq")
.jsSettings(libraryDependencies += "org.scala-js" %%% "scalajs-dom" % Ver.ScalaJsDom)

lazy val scalazJVM = scalaz.jvm
lazy val scalazJS = scalaz.js
Expand Down
11 changes: 11 additions & 0 deletions univeq/js/src/main/scala/japgolly/univeq/PlatformUnivEq.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package japgolly.univeq

import org.scalajs.dom.Element
import scala.scalajs.js

trait PlatformUnivEq {

@inline final implicit def univEqJsDomElement[A <: Element]: UnivEq[A] = UnivEq.force
@inline final implicit def univEqJsUndefOr [A: UnivEq] : UnivEq[js.UndefOr[A]] = UnivEq.force

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package japgolly.univeq

trait PlatformUnivEq {

}
2 changes: 1 addition & 1 deletion univeq/shared/src/main/scala/japgolly/univeq/UnivEq.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ trait UnivEq[@specialized A] {
a == b
}

object UnivEq {
object UnivEq extends PlatformUnivEq {

@inline def apply[A](implicit proof: UnivEq[A]): UnivEq[A] =
proof
Expand Down

0 comments on commit 20f3c3e

Please sign in to comment.