From cc2c4d5cde3866df774af43b6b9df3e5635763e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Fri, 7 Feb 2020 15:41:34 +0100 Subject: [PATCH] Add a test with Scala.js 1.0.0. --- .../src/sbt-test/new-api/scalajs-1.0.0/build.sbt | 9 +++++++++ .../new-api/scalajs-1.0.0/project/scalajs1x.sbt | 1 + .../src/main/scala/sbttest/Main.scala | 14 ++++++++++++++ .../src/sbt-test/new-api/scalajs-1.0.0/test | 3 +++ 4 files changed, 27 insertions(+) create mode 100644 sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/build.sbt create mode 100644 sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/project/scalajs1x.sbt create mode 100644 sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/src/main/scala/sbttest/Main.scala create mode 100644 sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/test diff --git a/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/build.sbt b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/build.sbt new file mode 100644 index 0000000..f260466 --- /dev/null +++ b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/build.sbt @@ -0,0 +1,9 @@ +scalaVersion in ThisBuild := "2.12.10" + +lazy val bar = + crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Pure) + .in(file(".")) + .jsSettings( + scalaJSUseMainModuleInitializer := true + ) diff --git a/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/project/scalajs1x.sbt b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/project/scalajs1x.sbt new file mode 100644 index 0000000..8365c11 --- /dev/null +++ b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/project/scalajs1x.sbt @@ -0,0 +1 @@ +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0") diff --git a/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/src/main/scala/sbttest/Main.scala b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/src/main/scala/sbttest/Main.scala new file mode 100644 index 0000000..fd5d3f9 --- /dev/null +++ b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/src/main/scala/sbttest/Main.scala @@ -0,0 +1,14 @@ +package sbttest + +object Main { + def main(args: Array[String]): Unit = { + println("Hello") + val vmVersion = System.getProperty("java.vm.version") + println(vmVersion) + + val isScalaJS = 1.0.toString() == "1" + println(s"isScalaJS = $isScalaJS") + if (isScalaJS) + assert(vmVersion == "1.0.0") + } +} diff --git a/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/test b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/test new file mode 100644 index 0000000..30f1548 --- /dev/null +++ b/sbt-crossproject-test/src/sbt-test/new-api/scalajs-1.0.0/test @@ -0,0 +1,3 @@ +> barJVM/run +> barJS/run +> barJS/testHtml