diff options
| author | Zach Smith <zach@driver.xyz> | 2017-10-03 11:42:53 -0700 |
|---|---|---|
| committer | Zach Smith <zach@driver.xyz> | 2017-10-03 11:42:53 -0700 |
| commit | d888d2fa64f9de5d0e5417f65e31c5e35817ec54 (patch) | |
| tree | 4d27b2bed94d7e39db7419b4f1b5016178643d58 | |
| parent | c9ccc77bcfe434716562ce19838e991025dbe7cc (diff) | |
| download | driver-core-d888d2fa64f9de5d0e5417f65e31c5e35817ec54.tar.gz driver-core-d888d2fa64f9de5d0e5417f65e31c5e35817ec54.tar.bz2 driver-core-d888d2fa64f9de5d0e5417f65e31c5e35817ec54.zip | |
Upgrade google pubsub and storage libraries
| -rw-r--r-- | build.sbt | 6 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/pubsub.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala | 3 |
3 files changed, 5 insertions, 6 deletions
@@ -2,7 +2,7 @@ import sbt._ import Keys._ lazy val akkaHttpV = "10.0.5" -lazy val googleTraceV = "0.4.0" +lazy val googleTraceV = "0.5.0" lazy val core = (project in file(".")) .driverLibrary("core") @@ -17,8 +17,8 @@ lazy val core = (project in file(".")) "org.mockito" % "mockito-core" % "1.9.5" % "test", "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.9.1", "com.amazonaws" % "aws-java-sdk-s3" % "1.11.26", - "com.google.cloud" % "google-cloud-pubsub" % "0.17.2-alpha", - "com.google.cloud" % "google-cloud-storage" % "1.6.0", + "com.google.cloud" % "google-cloud-pubsub" % "0.25.0-beta", + "com.google.cloud" % "google-cloud-storage" % "1.7.0", "com.typesafe.slick" %% "slick" % "3.2.1", "com.typesafe" % "config" % "1.2.1", "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0", diff --git a/src/main/scala/xyz/driver/core/pubsub.scala b/src/main/scala/xyz/driver/core/pubsub.scala index fcd096d..7885c1f 100644 --- a/src/main/scala/xyz/driver/core/pubsub.scala +++ b/src/main/scala/xyz/driver/core/pubsub.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.marshalling._ import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller} import akka.stream.Materializer import com.google.api.core.{ApiFutureCallback, ApiFutures} -import com.google.cloud.pubsub.spi.v1._ +import com.google.cloud.pubsub.v1._ import com.google.protobuf.ByteString import com.google.pubsub.v1.{PubsubMessage, PushConfig, SubscriptionName, TopicName} import com.typesafe.scalalogging.Logger diff --git a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala index 04f2ec6..ce84f9d 100644 --- a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala +++ b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala @@ -30,8 +30,7 @@ final class GoogleStackdriverTrace(projectId: String, new LoggingTraceConsumer(log) } { clientSecretsInputStream => GrpcTraceConsumer - .create( - "cloudtrace.googleapis.com", + .createWithCredentials( GoogleCredentials .fromStream(clientSecretsInputStream) .createScoped(util.Arrays.asList("https://www.googleapis.com/auth/trace.append")) |