diff --git a/build.sbt b/build.sbt index a64b79f..acf8d04 100644 --- a/build.sbt +++ b/build.sbt @@ -1,11 +1,8 @@ -// shadow sbt-scalajs' crossProject and CrossType from Scala.js 0.6.x -import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} - val Leaf = "0.1.0" val Scala2_11 = "2.11.12" -val Scala2_12 = "2.12.12" -val Scala2_13 = "2.13.3" -val ScalaTest = "3.2.2" +val Scala2_12 = "2.12.13" +val Scala2_13 = "2.13.4" +val ScalaTest = "3.2.4-M1" val SharedSettings = Seq( name := "trail", @@ -41,28 +38,23 @@ val SharedSettings = Seq( lazy val root = project.in(file(".")) .aggregate(trail.js, trail.jvm, trail.native) - .settings(SharedSettings: _*) + .settings(SharedSettings) .settings(skip in publish := true) lazy val trail = crossProject(JSPlatform, JVMPlatform, NativePlatform) .in(file(".")) - .settings(SharedSettings: _*) + .settings(SharedSettings) .settings( autoAPIMappings := true, apiMappings += (scalaInstance.value.libraryJar -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/")), libraryDependencies ++= Seq("freespec", "wordspec", "funspec", "funsuite", "shouldmatchers").map(module => "org.scalatest" %%% s"scalatest-$module" % ScalaTest % Test ) - ).nativeSettings( - scalaVersion := Scala2_11, - crossScalaVersions := Seq(Scala2_11), - // See https://github.com/scalalandio/chimney/issues/78#issuecomment-419705142 - Test / nativeLinkStubs := true ) lazy val manual = project.in(file("manual")) .dependsOn(trail.jvm) - .settings(SharedSettings: _*) + .settings(SharedSettings) .settings( name := "manual", publishArtifact := false, diff --git a/project/build.properties b/project/build.properties index 0837f7a..d91c272 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a7bcc2..dfbeda3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ logLevel := Level.Warn addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0-M2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")