From 4e74e7f66dbe45e165ca696829eecb8b8b020d72 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 4 Aug 2017 16:20:02 +0200
Subject: [PATCH] Take into account new cross version fields in sbt 1.0

---
 .../main/scala-2.12/coursier/SbtCompatibility.scala |  4 ++--
 .../src/sbt-test/sbt-coursier/scala-js/build.sbt    |  3 +++
 .../sbt-coursier/scala-js/project/plugins.sbt       | 13 +++++++++++++
 .../src/sbt-test/sbt-coursier/scala-js/test         |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt
 create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt
 create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test

diff --git a/sbt-coursier/src/main/scala-2.12/coursier/SbtCompatibility.scala b/sbt-coursier/src/main/scala-2.12/coursier/SbtCompatibility.scala
index 257ddac1b..c02b6f6b4 100644
--- a/sbt-coursier/src/main/scala-2.12/coursier/SbtCompatibility.scala
+++ b/sbt-coursier/src/main/scala-2.12/coursier/SbtCompatibility.scala
@@ -22,12 +22,12 @@ object SbtCompatibility {
 
   implicit class BinaryOps(private val binary: Binary) extends AnyVal {
     def remapVersion(scalaBinaryVersion: String): String =
-      scalaBinaryVersion
+      binary.prefix + scalaBinaryVersion + binary.suffix
   }
 
   implicit class FullOps(private val full: Full) extends AnyVal {
     def remapVersion(scalaVersion: String): String =
-      scalaVersion
+      full.prefix + scalaVersion + full.suffix
   }
 
 }
diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt
new file mode 100644
index 000000000..2c43a4b30
--- /dev/null
+++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt
@@ -0,0 +1,3 @@
+scalaVersion := "2.12.3"
+enablePlugins(ScalaJSPlugin)
+libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "0.2.2"
diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt
new file mode 100644
index 000000000..6abe6ecfb
--- /dev/null
+++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt
@@ -0,0 +1,13 @@
+{
+  val pluginVersion = sys.props.getOrElse(
+    "plugin.version",
+    throw new RuntimeException(
+      """|The system property 'plugin.version' is not defined.
+         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
+    )
+  )
+
+  addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion)
+}
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test
new file mode 100644
index 000000000..103bd8d2f
--- /dev/null
+++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test
@@ -0,0 +1 @@
+> update