Skip to content

Commit

Permalink
Set newer scalajs version pulled from ammonite explicitly
Browse files Browse the repository at this point in the history
* Update things scalajs depends on a newer version
* Update Scala versions
  • Loading branch information
sbrunk authored and stanch committed Dec 3, 2018
1 parent dd0e654 commit e488daa
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
13 changes: 9 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// shadow sbt-scalajs' crossProject and CrossType from Scala.js 0.6.x
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val commonSettings = Seq(
scalaVersion := "2.11.11",
crossScalaVersions := Seq("2.11.11", "2.12.2"),
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.7"),
scalacOptions ++= Seq(
"-feature", "-deprecation",
"-Xlint", "-Xfatal-warnings"
Expand Down Expand Up @@ -40,7 +43,8 @@ lazy val publishing = Seq(
publishTo := Some(Opts.resolver.sonatypeStaging)
)

val core = crossProject.in(file("core"))
val core = crossProject(JSPlatform, JVMPlatform)
.in(file("core"))
.settings(commonSettings)
.settings(
name := "reftree",
Expand Down Expand Up @@ -76,7 +80,8 @@ val core = crossProject.in(file("core"))
lazy val coreJVM = core.jvm
lazy val coreJS = core.js

val demo = crossProject.in(file("demo"))
val demo = crossProject(JSPlatform, JVMPlatform)
.in(file("demo"))
.settings(commonSettings)
.dependsOn(core)
.settings(
Expand Down
5 changes: 2 additions & 3 deletions demo/js/src/main/scala/reftree/demo/JsDemo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package reftree.demo
import reftree.diagram.Animation
import reftree.render.Renderer

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

object JsDemo extends js.JSApp {
def main(): Unit = {
object JsDemo {
def main(args: Array[String]): Unit = {
val renderer = Renderer()
import renderer._

Expand Down
3 changes: 2 additions & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sbt.version=0.13.13
sbt.version=0.13.17

4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.2")

addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-1")

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

addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.1")

Expand All @@ -15,3 +15,5 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.3.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 comments on commit e488daa

Please sign in to comment.