Skip to content

Commit

Permalink
updated to scalajs 1.0 (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
mliarakos committed May 30, 2020
1 parent bd3e5d1 commit d3b30d4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
13 changes: 6 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
val scalaVersions = Seq("2.12.10", "2.13.1")

val baseLagomVersion = "1.6.2"
val akkaJsVersion = "2.2.6.3"
val akkaJsVersion = "2.2.6.5"

lazy val scalaSettings = Seq(
crossScalaVersions := scalaVersions,
Expand Down Expand Up @@ -54,8 +54,7 @@ lazy val commonSettings = scalaSettings ++ publishSettings ++ Seq(
)

lazy val commonJsSettings = Seq(
jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv(),
scalacOptions += "-P:scalajs:sjsDefinedByDefault"
jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
)

lazy val lagomVersion = settingKey[String]("The Lagom version to use.")
Expand Down Expand Up @@ -139,7 +138,7 @@ lazy val `lagomjs-api` = crossProject(JSPlatform)
"org.akka-js" %%% "akkajsactor" % akkaJsVersion,
"org.akka-js" %%% "akkajsactorstream" % akkaJsVersion,
"org.scala-lang.modules" %%% "scala-parser-combinators" % "1.1.2",
"com.typesafe.play" %%% "play-json" % "2.8.1"
"com.typesafe.play" %%% "play-json" % "2.9.0"
)
)
.jsSettings(
Expand Down Expand Up @@ -183,7 +182,7 @@ lazy val `lagomjs-api-scaladsl` = crossProject(JSPlatform)
.jsSettings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
"org.scalatest" %%% "scalatest" % "3.0.8" % Test
"org.scalatest" %%% "scalatest" % "3.1.2" % Test
)
)
.jsSettings(
Expand Down Expand Up @@ -248,7 +247,7 @@ lazy val `lagomjs-client` = crossProject(JSPlatform)
.jsSettings(
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "1.0.0",
"org.scalatest" %%% "scalatest" % "3.0.8" % Test
"org.scalatest" %%% "scalatest" % "3.1.2" % Test
)
)
.jsSettings(
Expand Down Expand Up @@ -294,7 +293,7 @@ lazy val `lagomjs-client-scaladsl` = crossProject(JSPlatform)
.jsSettings(commonJsSettings: _*)
.jsSettings(
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % "3.0.8" % Test
"org.scalatest" %%% "scalatest" % "3.1.2" % Test
)
)
.jsSettings(
Expand Down
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.33")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("org.akka-js" % "sbt-shocon" % "0.5.0")
addSbtPlugin("org.akka-js" % "sbt-shocon" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")

libraryDependencies ++= Seq(
"org.eclipse.jgit" % "org.eclipse.jgit.pgm" % "3.7.1.201504261725-r"
"org.eclipse.jgit" % "org.eclipse.jgit.pgm" % "3.7.1.201504261725-r",
"org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
)

0 comments on commit d3b30d4

Please sign in to comment.