Update to scala.js 1.x (#55)

remove scala.js 0.6.x support and upgrade to scala.js 1.x
fdietze · Jun 25, 2020 · 4f51de0 · 4f51de0
1 parent b2a6dae
commit 4f51de0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/.jitpack.yml b/.jitpack.yml
@@ -3,6 +3,6 @@
 jdk:
   - oraclejdk8
 before_install:
-   - wget http://central.maven.org/maven2/org/scala-sbt/sbt-launch/1.2.8/sbt-launch-1.2.8.jar
+   - wget -q https://repo.maven.apache.org/maven2/org/scala-sbt/sbt-launch/1.2.8/sbt-launch-1.2.8.jar
 install:
-   - java -jar sbt-launch-1.2.8.jar +publishM2
+   - java -jar sbt-launch-1.2.8.jar +publishM2
diff --git a/.travis.yml b/.travis.yml
@@ -10,10 +10,6 @@ jdk:
 - openjdk8
 - openjdk11
 
-env:
-  - SCALAJS_VERSION=0.6.32
-  # - SCALAJS_VERSION=1.0.0-RC2
-
 script:
 - sbt ++$TRAVIS_SCALA_VERSION test benchJVM/compile benchJS/compile
 

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,3 @@
-// shadow sbt-scalajs' crossProject and CrossType until Scala.js 1.0.0 is released
-import sbtcrossproject.CrossPlugin.autoImport.{ crossProject, CrossType }
-
 val crossScalaVersionList = Seq("2.11.12", "2.12.10", "2.13.1")
 val scalaMajorVersion = SettingKey[Int]("scalaMajorVersion")
 val sharedSettings = Seq(
@@ -19,6 +16,7 @@ val sharedSettings = Seq(
     /* "-Ypartial-unification" :: */
     /* "-Yno-adapted-args" :: */
     /* "-Ywarn-infer-any" :: */
+    /* "-Ywarn-infer-any" :: */
     "-Ywarn-value-discard" ::
     /* "-Ywarn-nullary-override" :: */
     /* "-Ywarn-nullary-unit" :: */
@@ -49,7 +47,7 @@ lazy val flatland = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pu
     version := "master-SNAPSHOT",
     libraryDependencies ++= (
       "org.scalatest" %%% "scalatest" % "3.1.1" % Test ::
-      "org.scalatestplus" %%% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % Test ::
+      "org.scalatestplus" %%% "scalacheck-1-14" % "3.2.0.0" % Test ::
       "org.scalacheck" %%% "scalacheck" % "1.14.3" % Test ::
       Nil
     ),
@@ -74,7 +72,7 @@ lazy val bench = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure)
   .settings(
     version := "0.1.0",
     libraryDependencies ++=
-      "com.github.fdietze.bench" %%% "bench" % "87f4b74" ::
+      "com.github.fdietze.bench" %%% "bench" % "5ffab44" ::
       Nil,
 
     scalacOptions ++= {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,6 @@
-// https://www.scala-js.org/news/2018/02/01/announcing-scalajs-1.0.0-M3/#cross-building-for-scalajs-06x-and-1x
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.32")
-
 // https://github.com/portable-scala/sbt-crossproject
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")