WIP scala-js 1.0.0-M1

xuwei-k · Jul 2, 2017 · 9941862 · 9941862
1 parent 867ecf8
commit 9941862
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ import sbtunidoc.Plugin.UnidocKeys._
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 lazy val jsProjects = Seq[ProjectReference](
-  coreJS, effectJS, iterateeJS, scalacheckBindingJS, testsJS
+  coreJS, effectJS, iterateeJS, testsJS
 )
 
 lazy val jvmProjects = Seq[ProjectReference](
@@ -110,7 +110,6 @@ lazy val scalacheckBinding =
     .jsSettings(scalajsProjectSettings)
 
 lazy val scalacheckBindingJVM = scalacheckBinding.jvm
-lazy val scalacheckBindingJS  = scalacheckBinding.js
 
 lazy val tests = crossProject(JSPlatform, JVMPlatform).crossType(ScalazCrossType)
   .settings(standardSettings)
@@ -123,7 +122,6 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform).crossType(ScalazCrossType
   .jsSettings(scalajsProjectSettings)
 
 lazy val testsJVM = tests.jvm
-lazy val testsJS  = tests.js
 
 // can't use "sbt test"
 // https://github.com/scala-native/scala-native/issues/339

diff --git a/project/build.scala b/project/build.scala
@@ -21,7 +21,6 @@ import sbtbuildinfo.BuildInfoPlugin.autoImport._
 import scalanative.sbtplugin.ScalaNativePlugin.autoImport._
 import scalajscrossproject.ScalaJSCrossPlugin.autoImport.{toScalaJSGroupID => _, _}
 import sbtcrossproject.CrossPlugin.autoImport._
-import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.{isScalaJSProject, scalaJSOptimizerOptions}
 
 object build {
   type Sett = Def.Setting[_]
@@ -58,16 +57,6 @@ object build {
   }
 
   val scalajsProjectSettings = Seq[Sett](
-    scalaJSOptimizerOptions ~= { options =>
-      // https://github.com/scala-js/scala-js/issues/2798
-      try {
-        scala.util.Properties.isJavaAtLeast("1.8")
-        options
-      } catch {
-        case _: NumberFormatException =>
-          options.withParallel(false)
-      }
-    },
     scalacOptions += {
       val a = (baseDirectory in LocalRootProject).value.toURI.toString
       val g = "https://raw.githubusercontent.com/scalaz/scalaz/" + tagOrHash.value
@@ -147,10 +136,7 @@ object build {
     parallelExecution in Test := false,
     testOptions in Test += {
       val scalacheckOptions = Seq("-maxSize", "5", "-workers", "1", "-maxDiscardRatio", "50") ++ {
-        if(isScalaJSProject.value)
-          Seq("-minSuccessfulTests", "10")
-        else
-          Seq("-minSuccessfulTests", "33")
+        Seq("-minSuccessfulTests", "10")
       }
       Tests.Argument(TestFrameworks.ScalaCheck, scalacheckOptions: _*)
     },

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("org.scala-native" % "sbt-scalajs-crossproject" % "0.1.0")
 
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.1")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")