Skip to content

Commit

Permalink
Bump scalajs converter and bundler plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
EmergentOrder committed Mar 22, 2021
1 parent 69690ea commit 408af25
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,12 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
.jvmSettings(
libraryDependencies += ("org.scalatest" %% "scalatest" % scalaTestVersion) % Test,
).jsSettings(
scalaJSUseMainModuleInitializer := true) //, //Testing
scalaJSUseMainModuleInitializer := true, //Testing
npmDependencies in Compile += "onnxjs" -> "0.1.8")
//Seems to be a bundling issue, copying things manually seems to work
//TODO NEW: try JS, bundler and converter beta/RC are out
// npmDependencies in Compile += "onnxjs" -> "0.1.8")
.jsConfigure { project => project.enablePlugins(ScalaJSBundlerPlugin)} //,ScalablyTypedConverterPlugin) }

lazy val core = (crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure) in file("core"))
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.18" )
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") // "0.21.0-RC1")

resolvers += Resolver.bintrayRepo("oyvindberg", "converter")

// for Scala.js 1.x.x
addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta30")
addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta31")

0 comments on commit 408af25

Please sign in to comment.