From d68c3014ba7d311baaf1386805f5a8b878617f4c Mon Sep 17 00:00:00 2001 From: David Barri Date: Fri, 30 Jul 2021 12:01:29 +1000 Subject: [PATCH] Use scalajs-react in an effect-agnostic way --- project/Build.scala | 2 +- project/Dependencies.scala | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 52c28082..4837ec59 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -152,7 +152,7 @@ object ScalaCssBuild { .settings( moduleName := "ext-react", libraryDependencies ++= Seq( - Dep.scalaJsReactCore.value, + Dep.scalaJsReactCoreGen.value % Provided, Dep.scalaJsReactTest.value % Test, Dep.cats.value % Test, ), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 13936eea..7336cec6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -24,19 +24,20 @@ object Dependencies { } object Dep { - val cats = Def.setting("org.typelevel" %%% "cats-core" % Ver.cats) - val microlibsTestUtil = Def.setting("com.github.japgolly.microlibs" %%% "test-util" % Ver.microlibs) - val nyayaGen = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-gen" % Ver.nyaya) - val nyayaProp = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-prop" % Ver.nyaya) - val nyayaTest = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-test" % Ver.nyaya) - val scalaCompiler = Def.setting("org.scala-lang" % "scala-compiler" % scalaVersion.value) - val scalaJsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % Ver.scalaJsDom) - val scalaJsReactCore = Def.setting("com.github.japgolly.scalajs-react" %%% "core" % Ver.scalaJsReact) - val scalaJsReactTest = Def.setting("com.github.japgolly.scalajs-react" %%% "test" % Ver.scalaJsReact) - val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value) - val scalatags = Def.setting("com.lihaoyi" %%% "scalatags" % Ver.scalatags) - val univEq = Def.setting("com.github.japgolly.univeq" %%% "univeq" % Ver.univEq) - val utest = Def.setting("com.lihaoyi" %%% "utest" % Ver.utest) + val cats = Def.setting("org.typelevel" %%% "cats-core" % Ver.cats) + val microlibsTestUtil = Def.setting("com.github.japgolly.microlibs" %%% "test-util" % Ver.microlibs) + val nyayaGen = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-gen" % Ver.nyaya) + val nyayaProp = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-prop" % Ver.nyaya) + val nyayaTest = Def.setting("com.github.japgolly.nyaya" %%% "nyaya-test" % Ver.nyaya) + val scalaCompiler = Def.setting("org.scala-lang" % "scala-compiler" % scalaVersion.value) + val scalaJsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % Ver.scalaJsDom) + val scalaJsReactCore = Def.setting("com.github.japgolly.scalajs-react" %%% "core" % Ver.scalaJsReact) + val scalaJsReactCoreGen = Def.setting("com.github.japgolly.scalajs-react" %%% "core-generic" % Ver.scalaJsReact) + val scalaJsReactTest = Def.setting("com.github.japgolly.scalajs-react" %%% "test" % Ver.scalaJsReact) + val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value) + val scalatags = Def.setting("com.lihaoyi" %%% "scalatags" % Ver.scalatags) + val univEq = Def.setting("com.github.japgolly.univeq" %%% "univeq" % Ver.univEq) + val utest = Def.setting("com.lihaoyi" %%% "utest" % Ver.utest) } def addReactJsDependencies(scope: Configuration): Project => Project =