Skip to content

Commit

Permalink
Fix classpath for proptest.
Browse files Browse the repository at this point in the history
  • Loading branch information
thesamet committed Dec 2, 2015
1 parent 59e9fd5 commit ccf74c2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
13 changes: 11 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,23 @@ lazy val scalapbc = project.in(file("scalapbc"))
)

lazy val proptest = project.in(file("proptest"))
.dependsOn(runtimeJVM, compilerPlugin)
.dependsOn(runtimeJVM, grpcRuntime, compilerPlugin)
.configs( ShortTest )
.settings( inConfig(ShortTest)(Defaults.testTasks): _*)
.settings(
publishArtifact := false,
publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo"))),
testOptions += Tests.Argument(
libraryDependencies ++= Seq(
"com.github.os72" % "protoc-jar" % "3.0.0-b1",
"com.google.protobuf" % "protobuf-java" % "3.0.0-beta-1",
"io.grpc" % "grpc-all" % "0.9.0" % "test",
"com.trueaccord.lenses" %% "lenses" % "0.4.1",
"org.scalacheck" %% "scalacheck" % "1.12.4" % "test",
"org.scalatest" %% "scalatest" % (if (scalaVersion.value.startsWith("2.12")) "2.2.5-M2" else "2.2.5") % "test"
),
libraryDependencies <+= (scalaVersion) { v => "org.scala-lang" % "scala-compiler" % v },
testOptions += Tests.Argument(),
fork in Test := false,
testOptions in ShortTest += Tests.Argument(
// verbosity specified because of ScalaCheck #108.
"-verbosity", "3",
Expand Down
16 changes: 0 additions & 16 deletions proptest/build.sbt

This file was deleted.

1 change: 1 addition & 0 deletions proptest/src/test/scala/SchemaGenerators.scala
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ object SchemaGenerators {
jarForClass[annotation.Annotation].getPath,
jarForClass[com.trueaccord.scalapb.GeneratedMessage].getPath,
jarForClass[com.trueaccord.scalapb.Scalapb].getPath,
jarForClass[com.trueaccord.scalapb.grpc.Grpc.type].getPath,
jarForClass[com.google.protobuf.Message].getPath,
jarForClass[io.grpc.Channel].getPath,
jarForClass[com.google.common.util.concurrent.ListenableFuture[_]],
Expand Down

0 comments on commit ccf74c2

Please sign in to comment.