Skip to content

Commit

Permalink
Merge pull request #313 from softwaremill/js
Browse files Browse the repository at this point in the history
Add scala.js build
  • Loading branch information
adamw authored Jun 12, 2021
2 parents 6730ae5 + 472c073 commit 16b113d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ lazy val core = (projectMatrix in file(".core"))
Compile / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "core",
)
.jvmPlatform(scalaVersions = List(scala3))
.jsPlatform(scalaVersions = List(scala3))

lazy val examples = (projectMatrix in file(".examples"))
.dependsOn(core)
Expand All @@ -32,6 +33,7 @@ lazy val examples = (projectMatrix in file(".examples"))
Compile / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "examples",
)
.jvmPlatform(scalaVersions = List(scala3))
.jsPlatform(scalaVersions = List(scala3))

lazy val test = (projectMatrix in file(".test"))
.dependsOn(examples)
Expand All @@ -46,3 +48,4 @@ lazy val test = (projectMatrix in file(".test"))
publishArtifact := false,
)
.jvmPlatform(scalaVersions = List(scala3))
.jsPlatform(scalaVersions = List(scala3))
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.1
sbt.version=1.5.3
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")

val sbtSoftwareMillVersion = "2.0.3"
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")

0 comments on commit 16b113d

Please sign in to comment.