Skip to content

Commit cca97a3

Browse files
committedFeb 14, 2019
update deps and fix compilation problems
1 parent 37ede7e commit cca97a3

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed
 

‎build.sbt

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lazy val playserver = (project in file("play")).settings(
99
"com.vmunier" %% "scalajs-scripts" % "1.1.1",
1010
"org.webjars" %% "webjars-play" % "2.6.3",
1111
"org.webjars" % "bootstrap" % "3.1.1-2",
12-
"org.reactivemongo" %% "reactivemongo" % "0.13.0",
12+
"org.reactivemongo" %% "reactivemongo" % "0.16.2",
1313
"net.codingwell" %% "scala-guice" % "4.1.1",
1414
"com.ibm.icu" % "icu4j" % "61.1",
1515
guice
@@ -59,7 +59,8 @@ lazy val scalajsclient = (project in file("scalajs")).settings(
5959
minified "umd/react-dom-server.browser.production.min.js"
6060
dependsOn "umd/react-dom.development.js"
6161
commonJSName "ReactDOMServer"
62-
)
62+
),
63+
dependencyOverrides += "org.webjars.npm" % "js-tokens" % "3.0.2"
6364
).enablePlugins(ScalaJSPlugin, ScalaJSWeb).
6465
dependsOn(shared2Js)
6566

@@ -84,7 +85,7 @@ lazy val shared = crossProject(JSPlatform, JVMPlatform)
8485
"com.github.benhutchison" %%% "prickle" % "1.1.13",
8586
"com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion,
8687
"com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf",
87-
"org.reactivemongo" %% "reactivemongo-bson-macros" % "0.13.0" % Provided intransitive(),
88+
"org.reactivemongo" %% "reactivemongo-bson-macros" % "0.16.2" % Provided intransitive(),
8889
"io.grpc" % "grpc-netty" % "1.10.0",
8990
),
9091
PB.targets in Compile := Seq(

‎play/app/code/annotation/AnnotationDb.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class SentenceDbo @Inject()(
338338

339339
val proj = BSONDocument("_id" -> 1)
340340

341-
coll.find(q, proj).one[BSONDocument].map {
341+
coll.find(q, Some(proj)).one[BSONDocument].map {
342342
case Some(doc) => doc.getAs[String]("_id")
343343
case _ => None
344344
}
@@ -358,14 +358,14 @@ class SentenceDbo @Inject()(
358358
"_id" -> 1
359359
)
360360
coll
361-
.find(q, vals)
361+
.find(q, Some(vals))
362362
.cursor[BSONDocument]()
363363
.collect[Set](ids.size, Cursor.FailOnError[Set[BSONDocument]]())
364364
.map(_.map(_.getAs[String]("_id").get))
365365
}
366366

367367
def saveSentences(data: Seq[Sentence]): Future[Int] = {
368-
coll.insert[Sentence](ordered = false).many(data).map(_.totalN)
368+
coll.insert(ordered = false).many(data).map(_.totalN)
369369
}
370370

371371
private def convertCommonStatus(

‎play/conf/application.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ demo.jumanpp_lattice = {
6161
akane.jumanpp.grpc {
6262
executable = /Users/eiennohito/dev/nlp/tools/jumanpp-grpc/cmake-build-release/src/jumandic/jumanpp-jumandic-grpc
6363
config = /usr/local/Cellar/jumanpp/2.0.0-rc2/libexec/jumanpp/jumandic.config
64-
# config = "/Users/eiennohito/dev/nlp/corpus/reading/unidic.config"
64+
#config = "/Users/eiennohito/dev/nlp/corpus/reading/unidic.config"
6565
args = ["--generic"]
6666
}
6767

‎project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Activator-generated Properties
22
#Wed Sep 28 11:12:52 JST 2016
3-
sbt.version=1.1.1
3+
sbt.version=1.2.1

‎project/plugins.sbt

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
33
libraryDependencies += "com.github.os72" % "protoc-jar" % "3.5.0"
44

55
// The Play plugin
6-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.10")
6+
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
77

8-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2")
8+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.18")
99

1010
// web plugins
1111

@@ -19,12 +19,11 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")
1919

2020
//addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.0.0")
2121

22-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
22+
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.0.8-0.6")
2323

24-
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.0.6")
25-
26-
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.1")
27-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.1")
24+
//addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.1")
25+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
26+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
2827

2928
val scalaPbVersion = "0.7.0"
3029
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin-shaded" % scalaPbVersion

0 commit comments

Comments
 (0)