Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit 3396682

Browse files
authored
Merge pull request #10 from cquiroz/react-upg
Library upgrades
2 parents d30b403 + e235901 commit 3396682

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: scala
22
scala:
3-
- 2.12.3
3+
- 2.12.6
44
jdk:
55
- oraclejdk8
66
# These directories are cached to S3 at the end of the build

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changes
22

3-
## 0.3.3
3+
## 0.4.0
4+
5+
* Upgraded to scala.js react 1.3.0
6+
7+
## 0.3.4
48

59
* Addeed method to create columns with flexGrow/flexShrink set to 0
610
* Make defaultRendererXXX functions public

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
val reactJS = "16.2.0"
1+
val reactJS = "16.5.0"
22
val reactVirtualized = "9.20.1"
3-
val scalaJsReact = "1.2.3"
3+
val scalaJsReact = "1.3.0"
44

55
parallelExecution in (ThisBuild, Test) := false
66

@@ -33,8 +33,8 @@ lazy val demo =
3333
webpackBundlingMode := BundlingMode.LibraryOnly(),
3434
webpackDevServerExtraArgs := Seq("--inline"),
3535
webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"),
36-
version in webpack := "4.8.1",
37-
version in startWebpackDevServer := "3.1.4",
36+
version in webpack := "4.19.1",
37+
version in startWebpackDevServer := "3.1.8",
3838
// don't publish the demo
3939
publish := {},
4040
publishLocal := {},
@@ -60,15 +60,15 @@ lazy val facade =
6060
requiresDOM in Test := true,
6161
// Use yarn as it is faster than npm
6262
useYarn := true,
63-
version in webpack := "4.16.1",
63+
version in webpack := "4.19.1",
6464
scalaJSUseMainModuleInitializer := false,
6565
// Compile tests to JS using fast-optimisation
6666
scalaJSStage in Test := FastOptStage,
6767
libraryDependencies ++= Seq(
6868
"com.github.japgolly.scalajs-react" %%% "core" % scalaJsReact,
6969
"com.github.japgolly.scalajs-react" %%% "test" % scalaJsReact % "test",
70-
"com.lihaoyi" %%% "utest" % "0.6.4" % Test,
71-
"org.typelevel" %%% "cats-core" % "1.1.0" % Test
70+
"com.lihaoyi" %%% "utest" % "0.6.5" % Test,
71+
"org.typelevel" %%% "cats-core" % "1.4.0" % Test
7272
),
7373
webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"),
7474
testFrameworks += new TestFramework("utest.runner.Framework")

project/build.properties

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

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
22

33
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.1")
44

55
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
66

7-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
7+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
88

9-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
9+
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

0 commit comments

Comments
 (0)