Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k authored and thesamet committed Jul 15, 2017
1 parent 769aa56 commit bc9bc6a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ matrix:
env: TEST_SCRIPT=__misc__
script:
- cd examples && sbt test && cd ..
- ./test_generated_code_checked_in.sh
- sbt -J-Xmx4500M ++$TRAVIS_SCALA_VERSION universal:packageBin
- ./test_generated_code_checked_in.sh

# These directories are cached to S3 at the end of the build
cache:
Expand Down
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ lazy val runtime = crossProject.crossType(CrossType.Full).in(file("scalapb-runti
name := "scalapb-runtime",
libraryDependencies ++= Seq(
"com.trueaccord.lenses" %%% "lenses" % "0.4.12",
"com.lihaoyi" %%% "fastparse" % "0.4.2",
"com.lihaoyi" %%% "utest" % "0.4.5" % "test",
"com.lihaoyi" %%% "fastparse" % "0.4.3",
"com.lihaoyi" %%% "utest" % "0.4.7" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"org.scalatest" %%% "scalatest" % "3.0.1" % "test"
"org.scalatest" %%% "scalatest" % "3.0.3" % "test"
),
testFrameworks += new TestFramework("utest.runner.Framework"),
unmanagedResourceDirectories in Compile += baseDirectory.value / "../../protobuf"
Expand All @@ -73,7 +73,7 @@ lazy val runtime = crossProject.crossType(CrossType.Full).in(file("scalapb-runti
.jsSettings(
// Add JS-specific settings here
libraryDependencies ++= Seq(
"com.trueaccord.scalapb" %%% "protobuf-runtime-scala" % "0.1.16"
"com.trueaccord.scalapb" %%% "protobuf-runtime-scala" % "0.1.18"
),
scalacOptions += {
val a = (baseDirectory in LocalRootProject).value.toURI.toString
Expand All @@ -94,8 +94,8 @@ lazy val grpcRuntime = project.in(file("scalapb-runtime-grpc"))
name := "scalapb-runtime-grpc",
libraryDependencies ++= Seq(
"io.grpc" % "grpc-stub" % grpcVersion,
"org.scalatest" %% "scalatest" % "3.0.1" % "test",
"org.mockito" % "mockito-core" % "2.7.22" % "test"
"org.scalatest" %% "scalatest" % "3.0.3" % "test",
"org.mockito" % "mockito-core" % "2.8.47" % "test"
)
)

Expand All @@ -120,8 +120,8 @@ lazy val compilerPlugin = project.in(file("compiler-plugin"))
Seq(dest)
}.taskValue,
libraryDependencies ++= Seq(
"com.trueaccord.scalapb" %% "protoc-bridge" % "0.2.6",
"org.scalatest" %% "scalatest" % "3.0.1" % "test"
"com.trueaccord.scalapb" %% "protoc-bridge" % "0.2.7",
"org.scalatest" %% "scalatest" % "3.0.3" % "test"
))

// Until https://github.com/scalapb/ScalaPB/issues/150 is fixed, we are
Expand Down Expand Up @@ -175,13 +175,13 @@ lazy val proptest = project.in(file("proptest"))
publishArtifact := false,
publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo"))),
libraryDependencies ++= Seq(
"com.github.os72" % "protoc-jar" % "3.3.0",
"com.github.os72" % "protoc-jar" % "3.3.0.1",
"com.google.protobuf" % "protobuf-java" % protobufVersion,
"io.grpc" % "grpc-netty" % grpcVersion % "test",
"com.trueaccord.lenses" %% "lenses" % "0.4.12",
"com.trueaccord.scalapb" %% "scalapb-json4s" % "0.1.5",
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"org.scalatest" %% "scalatest" % "3.0.1" % "test"
"org.scalatest" %% "scalatest" % "3.0.3" % "test"
),
scalacOptions in Compile ++= Seq("-Xmax-classfile-name", "128"),
libraryDependencies += { "org.scala-lang" % "scala-compiler" % scalaVersion.value },
Expand Down
4 changes: 2 additions & 2 deletions e2e/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ val commonSettings = Seq(
s"--java_rpc_out=${((sourceManaged in Compile).value).getAbsolutePath}"
),
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.0.1" % "test",
"org.scalatest" %% "scalatest" % "3.0.3" % "test",
"io.grpc" % "grpc-netty" % grpcJavaVersion, //netty transport of grpc
"io.grpc" % "grpc-protobuf" % grpcJavaVersion, //protobuf message encoding for java implementation
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"com.trueaccord.scalapb" %% "scalapb-runtime" % com.trueaccord.scalapb.Version.scalapbVersion % "protobuf",
"com.trueaccord.scalapb" %% "scalapb-json4s" % "0.1.5"
"com.trueaccord.scalapb" %% "scalapb-json4s" % "0.3.2"
),
grpcExePath := xsbti.SafeLazy {
val exe: File = (baseDirectory in ThisBuild).value / ".bin" / grpcExeFileName
Expand Down
2 changes: 1 addition & 1 deletion scalapbc/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
enablePlugins(JavaAppPackaging)

libraryDependencies ++= Seq(
"com.github.os72" % "protoc-jar" % "3.3.0"
"com.github.os72" % "protoc-jar" % "3.3.0.1"
)
2 changes: 1 addition & 1 deletion test_generated_code_checked_in.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Test that all generated code is checked in.
set -e

echo "java -jar ${HOME}/.ivy2/cache/com.github.os72/protoc-jar/jars/protoc-jar-3.3.0.jar \$@" > protoc
echo "java -jar ${HOME}/.ivy2/cache/com.github.os72/protoc-jar/jars/protoc-jar-3.3.0.1.jar \$@" > protoc
chmod +x protoc
PATH=${PATH}:${PWD} ./make_plugin_proto.sh
rm protoc
Expand Down

0 comments on commit bc9bc6a

Please sign in to comment.