From 16b7c0c78e419fefd73d161fdd52ee6ad3f644cf Mon Sep 17 00:00:00 2001 From: Antoine Gourlay Date: Sat, 4 Nov 2017 17:27:48 +0100 Subject: [PATCH 1/2] Fix js and native project names sbt-crossproject already handles that, but naming them by hand changed the name of the produced artifacts (`scala-parser-combinators-js_sjs0.6_2.12-...`). --- build.sbt | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.sbt b/build.sbt index 394111be..09dce913 100644 --- a/build.sbt +++ b/build.sbt @@ -44,19 +44,16 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati jvmSettings( // Mima uses the name of the jvm project in the artifactId // when resolving previous versions (so no "-jvm" project) - name := "scala-parser-combinators", OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"), libraryDependencies += "junit" % "junit" % "4.12" % "test", libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" ). jsSettings( - name := "scala-parser-combinators-js", // Scala.js cannot run forked tests fork in Test := false ). jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)). nativeSettings( - name := "scala-parser-combinators-native", scalaVersion := "2.11.11", skip in compile := System.getProperty("java.version").startsWith("1.6"), test := {}, From 18e1a75ff18ebfe3b7a408727f2b401a355e6679 Mon Sep 17 00:00:00 2001 From: Antoine Gourlay Date: Sat, 4 Nov 2017 17:32:40 +0100 Subject: [PATCH 2/2] bump sbt & plugin versions. --- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/build.properties b/project/build.properties index 64317fda..c091b86c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.16 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7620ecc4..5b32d634 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18") -addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.0") -addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21") +addSbtPlugin("org.scala-native" % "sbt-crossproject" % "0.2.2") +addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.2.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.3")