Fixups after rebase

.travis.yml

@@ -61,14 +61,13 @@ jobs:
     - env:
       - DIR=geode
       - PRE_CMD="docker-compose up -d geode"
-      - CMD=+geode/testChanged
-    - env: CMD=+google-cloud-pub-sub/testChanged
-    - env: CMD=+google-cloud-storage/testChanged
     - env:
       - DIR=google-cloud-pub-sub
     - env:
       - DIR=google-cloud-pub-sub-grpc
       - PRE_CMD="docker-compose up -d gcloud-pubsub-emulator_prep"
+    - env:
+      - DIR=google-cloud-storage
     - env:
       - DIR=google-fcm
     - env:

build.sbt

@@ -174,7 +174,8 @@ lazy val googleCloudPubSubGrpc = alpakkaProject(
   crossScalaVersions --= Seq(Dependencies.Scala211, Dependencies.Scala213) // https://github.com/akka/akka-grpc/pull/599
 ).enablePlugins(AkkaGrpcPlugin, JavaAgent)
 
-lazy val googleCloudStorage = alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage)
+lazy val googleCloudStorage =
+  alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage).disablePlugins(MimaPlugin)
 
 lazy val googleFcm = alpakkaProject(
   "google-fcm",
@@ -184,9 +185,6 @@ lazy val googleFcm = alpakkaProject(
   crossScalaVersions -= Dependencies.Scala213 // requires upgrade of jwt-core to 3.0.1
 )
 
-lazy val googleCloudStorage =
-  alpakkaProject("google-cloud-storage", "google.cloud.storage", Dependencies.GoogleStorage).disablePlugins(MimaPlugin)
-
 lazy val hbase = alpakkaProject("hbase", "hbase", Dependencies.HBase, fork in Test := true)
 
 lazy val hdfs = alpakkaProject("hdfs",

docs/src/main/paradox/google-cloud-storage.md

@@ -1,9 +1,9 @@
-# Google Cloud Storage 
+# Google Cloud Storage
 
 Google Cloud Storage allows world-wide storage and retrieval of any amount of data at any time.
 
 Further information at the official [Google Cloud Storage documentation website](https://cloud.google.com/storage/docs/).
-This connector communicates to Cloud Storage via HTTP requests. 
+This connector communicates to Cloud Storage via HTTP requests.
 
 @@project-info{ projectId="google-cloud-storage" }
 
@@ -124,7 +124,7 @@ Java
 : @@snip [snip](/google-cloud-storage/src/test/java/docs/javadsl/GCStorageTest.java) { #delete-bucket }
 
 
-### Get bucket 
+### Get bucket
 To get a bucket you need to specify its name.
 
 Scala
@@ -151,6 +151,3 @@ Java
     ```
 
 > Some test code requires access to Google cloud storage, to run them you will need to configure a project and pub/sub in google cloud and provide your own credentials.
-                                                          
-
-

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/Bucket.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/ObjectNotFoundException.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageSettings.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketInfo.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/BucketListResult.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Chunker.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl
@@ -23,7 +23,7 @@ private[storage] class Chunker(val chunkSize: Int) extends GraphStage[FlowShape[
 
   override def createLogic(inheritedAttributes: Attributes): GraphStageLogic = new GraphStageLogic(shape) {
     private val bufferBuilder = ByteString.newBuilder
-    private var totalSize = 0l
+    private var totalSize = 0L
 
     setHandler(out, new OutHandler {
       override def onPull(): Unit =

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/Formats.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleSession.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApi.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/MultiPartUpload.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/RewriteResponse.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/TokenApiSettings.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/WithMaterializerGlobal.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage

google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/ChunkerSpec.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/impl/GoogleTokenApiSpec.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.impl

google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
+ * Copyright (C) 2016-2019 Lightbend Inc. <http://www.lightbend.com>
  */
 
 package akka.stream.alpakka.googlecloud.storage.scaladsl
@@ -95,7 +95,7 @@ abstract class GCStorageWiremockBase(_system: ActorSystem, _wireMockServer: Wire
         .post(
           urlEqualTo(s"/b?project=testX-XXXXX")
         )
-        .withRequestBody(WireMock.equalTo(createBucketJsonRequest))
+        .withRequestBody(WireMock.equalToJson(createBucketJsonRequest))
         .withHeader("Authorization", WireMock.equalTo("Bearer " + TestCredentials.accessToken))
         .willReturn(
           aResponse()
@@ -113,7 +113,7 @@ abstract class GCStorageWiremockBase(_system: ActorSystem, _wireMockServer: Wire
         .post(
           urlEqualTo(s"/b?project=testX-XXXXX")
         )
-        .withRequestBody(WireMock.equalTo(createBucketJsonRequest))
+        .withRequestBody(WireMock.equalToJson(createBucketJsonRequest))
         .withHeader("Authorization", WireMock.equalTo("Bearer " + TestCredentials.accessToken))
         .willReturn(
           aResponse()

project/project-info.conf

@@ -302,7 +302,7 @@ project-info {
       {
         readiness: CommunityDriven
         since: "2019-06-06"
-        since-version: "1.0-M2"
+        since-version: "1.0.3"
       }
     ]
     api-docs: [