Skip to content

Commit 157cf39

Browse files
committed
update
1 parent d4b5df4 commit 157cf39

File tree

5 files changed

+424
-280
lines changed

5 files changed

+424
-280
lines changed

build.sbt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name := "web"
22

3-
//version := "2017.12.0-SNAPSHOT"
3+
//version := "2018.9.0-SNAPSHOT"
44

55
enablePlugins(ScalaJSPlugin)
66

77

8-
val scala212 = "2.12.4"
8+
val scala212 = "2.12.6"
99

1010
scalaVersion := scala212
1111

@@ -19,8 +19,8 @@ scalacOptions ++= Seq(
1919
)
2020

2121
//Dependencies
22-
libraryDependencies ++= Seq("scalajs-react-interface" %%% "universal" % "2018.2.2-RC" % Provided,
23-
"scalajs-react-interface" %%% "core" % "2018.2.2-RC" % Provided)
22+
libraryDependencies ++= Seq("scalajs-react-interface" %%% "universal" % "2018.9.22-RC" % Provided,
23+
"scalajs-react-interface" %%% "core" % "2018.9.22-RC" % Provided)
2424

2525

2626

@@ -44,6 +44,7 @@ publishArtifact in Test := false
4444
//Test
4545
resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
4646
scalaJSUseMainModuleInitializer in Test := true
47+
scalaJSUseTestModuleInitializer in Test := false
4748

4849
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)
4950
.withSourceMap(false))
@@ -77,8 +78,8 @@ resolvers ++=Seq(Resolver.bintrayRepo("scalajs-react-interface", "maven"),
7778
Resolver.bintrayRepo("scalajs-plus", "maven"))
7879

7980
libraryDependencies ++= Seq(
80-
"org.scala-js" %%% "scalajs-dom" % "0.9.4" % Test,
81-
"scalajs-jest" %%% "core" % "2018.2.2-RC" % Test
81+
"org.scala-js" %%% "scalajs-dom" % "0.9.6" % Test,
82+
"scalajs-jest" %%% "core" % "2018.8.14-RC" % Test
8283
)
8384
//scalaJSStage in Global := FastOptStage
8485
scalaJSStage in Global := FullOptStage

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
},
1212
"devDependencies": {},
1313
"dependencies": {
14-
"jest": "^22.0.4"
14+
"jest": "^23.6.0"
1515
}
1616
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.1.0
1+
sbt.version=1.2.1
22

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M3")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M5")
22
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
33
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")
44
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")

0 commit comments

Comments
 (0)