Skip to content

Commit e4a3441

Browse files
authored
Merge pull request #243 from typelevel/topic/update
Scala.js 1
2 parents 5097e25 + 3c576ee commit e4a3441

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ inThisBuild(
2121
List(
2222
organization := "org.typelevel",
2323
scalaVersion := Scala213,
24-
crossScalaVersions := Seq(Scala211, Scala212, Scala213),
24+
crossScalaVersions := Seq(Scala212, Scala213),
2525
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
2626
homepage := Some(url("https://github.com/typelevel/paiges")),
2727
pomExtra := (
@@ -110,8 +110,8 @@ lazy val cats = crossProject(JSPlatform, JVMPlatform)
110110
name := "paiges-cats",
111111
moduleName := "paiges-cats",
112112
libraryDependencies ++= Seq(
113-
"org.typelevel" %%% "cats-core" % "2.0.0",
114-
"org.typelevel" %%% "cats-laws" % "2.0.0" % Test,
113+
"org.typelevel" %%% "cats-core" % "2.1.1",
114+
"org.typelevel" %%% "cats-laws" % "2.1.1" % Test,
115115
"org.typelevel" %%% "discipline-scalatest" % "1.0.1" % Test
116116
),
117117
mimaPreviousArtifacts := previousArtifact(version.value, "cats")
@@ -201,8 +201,6 @@ lazy val commonJsSettings = Seq(
201201
scalaJSStage in Global := FastOptStage,
202202
parallelExecution := false,
203203
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
204-
// batch mode decreases the amount of memory needed to compile scala.js code
205-
scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(scala.sys.env.get("TRAVIS").isDefined),
206204
coverageEnabled := false
207205
)
208206

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.2")
22
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.4")
3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0")
44
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.13")
55
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
66
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")

0 commit comments

Comments
 (0)