diff --git a/BigQueryDataTransfer/composer.json b/BigQueryDataTransfer/composer.json index c36b951df288..9a85a108e41f 100644 --- a/BigQueryDataTransfer/composer.json +++ b/BigQueryDataTransfer/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Bigtable/composer.json b/Bigtable/composer.json index 304a26a04e29..0010ca6d64e2 100644 --- a/Bigtable/composer.json +++ b/Bigtable/composer.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "minimum-stability": "stable", "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Container/composer.json b/Container/composer.json index dc57645b89b0..06af9ec21e30 100644 --- a/Container/composer.json +++ b/Container/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Core/composer.json b/Core/composer.json index 575c2800a37a..859525b732d7 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -17,7 +17,7 @@ "squizlabs/php_codesniffer": "2.*", "phpdocumentor/reflection": "^3.0", "erusev/parsedown": "^1.6", - "google/gax": "^0.37", + "google/gax": "^0.36", "opis/closure": "^3" }, "suggest": { diff --git a/Dataproc/composer.json b/Dataproc/composer.json index 49401f42c887..606668c901a9 100644 --- a/Dataproc/composer.json +++ b/Dataproc/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Debugger/composer.json b/Debugger/composer.json index 23636ec1bcbc..b47870c3601f 100644 --- a/Debugger/composer.json +++ b/Debugger/composer.json @@ -6,7 +6,7 @@ "require": { "google/cloud-core": "^1.23", "google/cloud-logging": "^1.4", - "google/gax": "^0.37", + "google/gax": "^0.36", "psr/log": "^1.0" }, "require-dev": { diff --git a/Dialogflow/composer.json b/Dialogflow/composer.json index 5971fa892c00..6de606d23c23 100644 --- a/Dialogflow/composer.json +++ b/Dialogflow/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Dlp/composer.json b/Dlp/composer.json index 6cfca22b3bf7..782ff7246253 100644 --- a/Dlp/composer.json +++ b/Dlp/composer.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "minimum-stability": "stable", "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/ErrorReporting/composer.json b/ErrorReporting/composer.json index b9c9c06caa25..2796b0d0fd69 100644 --- a/ErrorReporting/composer.json +++ b/ErrorReporting/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-logging": "^1.5.0", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Firestore/composer.json b/Firestore/composer.json index 501d768b1fe3..dbd70ace25b7 100644 --- a/Firestore/composer.json +++ b/Firestore/composer.json @@ -6,7 +6,7 @@ "require": { "ext-grpc": "*", "google/cloud-core": "^1.23", - "google/gax": "^0.37", + "google/gax": "^0.36", "ramsey/uuid": "~3" }, "require-dev": { diff --git a/Iot/composer.json b/Iot/composer.json index a772faccf10c..ff381f3b3ff9 100644 --- a/Iot/composer.json +++ b/Iot/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Kms/composer.json b/Kms/composer.json index accf51ae74c7..0ffbc49c1385 100644 --- a/Kms/composer.json +++ b/Kms/composer.json @@ -23,7 +23,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Language/composer.json b/Language/composer.json index 948679164b4e..fe4f8e522c16 100644 --- a/Language/composer.json +++ b/Language/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Logging/composer.json b/Logging/composer.json index a94e961fa777..52b9d7829ad7 100644 --- a/Logging/composer.json +++ b/Logging/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Monitoring/composer.json b/Monitoring/composer.json index aed739f53c8e..5a3fe2137f79 100644 --- a/Monitoring/composer.json +++ b/Monitoring/composer.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "minimum-stability": "stable", "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/OsLogin/composer.json b/OsLogin/composer.json index b8f47ead7f9b..b750e121fcaf 100644 --- a/OsLogin/composer.json +++ b/OsLogin/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/PubSub/composer.json b/PubSub/composer.json index bddff1473634..f82b22e196c0 100644 --- a/PubSub/composer.json +++ b/PubSub/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Redis/composer.json b/Redis/composer.json index e837fb098165..e4e5612054b9 100644 --- a/Redis/composer.json +++ b/Redis/composer.json @@ -19,7 +19,7 @@ }, "require": { "ext-grpc": "*", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Spanner/composer.json b/Spanner/composer.json index fae5df0d84f3..bc0735c9ce25 100644 --- a/Spanner/composer.json +++ b/Spanner/composer.json @@ -6,7 +6,7 @@ "require": { "ext-grpc": "*", "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Spanner/src/V1/Gapic/SpannerGapicClient.php b/Spanner/src/V1/Gapic/SpannerGapicClient.php index bac8b3b64779..b6bd68dfb4b4 100644 --- a/Spanner/src/V1/Gapic/SpannerGapicClient.php +++ b/Spanner/src/V1/Gapic/SpannerGapicClient.php @@ -129,7 +129,6 @@ private static function getClientDefaults() 'serviceAddress' => self::SERVICE_ADDRESS.':'.self::DEFAULT_SERVICE_PORT, 'clientConfig' => __DIR__.'/../resources/spanner_client_config.json', 'descriptorsConfigPath' => __DIR__.'/../resources/spanner_descriptor_config.php', - 'gcpApiConfigPath' => __DIR__.'/../resources/spanner_grpc_config.json', 'credentialsConfig' => [ 'scopes' => self::$serviceScopes, ], diff --git a/Spanner/src/V1/resources/spanner_grpc_config.json b/Spanner/src/V1/resources/spanner_grpc_config.json deleted file mode 100644 index abb715132d84..000000000000 --- a/Spanner/src/V1/resources/spanner_grpc_config.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "channelPool": { - "maxSize": 10, - "maxConcurrentStreamsLowWatermark": 100 - }, - "method": [ - { - "name": [ - "/google.spanner.v1.Spanner/CreateSession" - ], - "affinity": { - "command": "BIND", - "affinityKey": "name" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/GetSession" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "name" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/DeleteSession" - ], - "affinity": { - "command": "UNBIND", - "affinityKey": "name" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/ExecuteSql" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/ExecuteStreamingSql" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/Read" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/StreamingRead" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/BeginTransaction" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/Commit" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/Rollback" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/PartitionQuery" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - }, - { - "name": [ - "/google.spanner.v1.Spanner/PartitionRead" - ], - "affinity": { - "command": "BOUND", - "affinityKey": "session" - } - } - ] -} \ No newline at end of file diff --git a/Speech/composer.json b/Speech/composer.json index a014ffeffcf7..d2e67244c935 100644 --- a/Speech/composer.json +++ b/Speech/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Tasks/composer.json b/Tasks/composer.json index b44c5c0e5ecf..68aaef542c67 100644 --- a/Tasks/composer.json +++ b/Tasks/composer.json @@ -23,7 +23,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/TextToSpeech/composer.json b/TextToSpeech/composer.json index 14261a7e9dcc..79e0afb67758 100644 --- a/TextToSpeech/composer.json +++ b/TextToSpeech/composer.json @@ -23,7 +23,7 @@ } }, "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Trace/composer.json b/Trace/composer.json index 0d510d1d84b1..74eafd64f181 100644 --- a/Trace/composer.json +++ b/Trace/composer.json @@ -6,7 +6,7 @@ "require": { "google/cloud-core": "^1.23", "ramsey/uuid": "~3", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/VideoIntelligence/composer.json b/VideoIntelligence/composer.json index d17fa370f728..080fb9634ee1 100644 --- a/VideoIntelligence/composer.json +++ b/VideoIntelligence/composer.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "minimum-stability": "stable", "require": { - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/Vision/composer.json b/Vision/composer.json index 3d3849972a8d..c9226299de99 100644 --- a/Vision/composer.json +++ b/Vision/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "stable", "require": { "google/cloud-core": "^1.23", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/composer.json b/composer.json index 0a0e1d1911aa..100dde37eaa0 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "monolog/monolog": "~1", "psr/http-message": "1.0.*", "ramsey/uuid": "~3", - "google/gax": "^0.37" + "google/gax": "^0.36" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", @@ -213,4 +213,4 @@ ] } } -} +} \ No newline at end of file