Skip to content

Commit 10b7eaa

Browse files
committed
Merge branch 'master' into update/scalacss-0.7.0
2 parents f8b8fec + 7b9f8e2 commit 10b7eaa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ lazy val bridge = (project in file("utils/bridge"))
102102

103103
lazy val commonProfile: Project => Project =
104104
_.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings(
105-
crossScalaVersions := Seq("2.12.11", "2.13.3"),
105+
crossScalaVersions := Seq("2.12.13", "2.13.3"),
106106
scalaVersion := crossScalaVersions.value.last,
107107
description := Settings.description,
108108
webpackBundlingMode := BundlingMode.LibraryOnly(),

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
44
object Dependencies {
55

66
object Versions {
7-
val scalaCssV = "0.7.0"
8-
val scalaJsReactV = "1.7.6"
7+
val scalaCssV = "0.6.1"
8+
val scalaJsReactV = "1.7.7"
99
}
1010

1111
import Versions._

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.4.5
1+
sbt.version = 1.4.9

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
88

99
addSbtPlugin("ch.epfl.scala" % s"sbt-scalajs-bundler${if (scalaJSVersion.startsWith("0.6")) "-sjs06" else ""}" % s"0.${if (scalaJSVersion.startsWith("0.6")) "18" else "20"}.0")
1010

11-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
11+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")
1212

13-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.24")
13+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26")
1414

15-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
15+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.6")

scalafix.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ semanticdbVersion in ThisBuild := scalafixSemanticdb.revision
55
scalafixScalaBinaryVersion in ThisBuild := "2.13"
66

77
scalafixDependencies in ThisBuild ++= Seq(
8-
"com.github.liancheng" %% "organize-imports" % "0.4.4"
8+
"com.github.liancheng" %% "organize-imports" % "0.5.0"
99
)

0 commit comments

Comments
 (0)