Skip to content

Commit

Permalink
Revert "Spanner grpc config" (#1240)
Browse files Browse the repository at this point in the history 
* Revert "Fix suppressKeyFileNotice check (#1237)"

This reverts commit 49c698f.

* Revert "Spanner grpc config (#1236)"

This reverts commit 198404a.
  • Loading branch information
@dwsupplee
dwsupplee authored Aug 22, 2018
1 parent ca44e61 commit e646b9c
Show file tree
Hide file tree
Showing 28 changed files with 27 additions and 144 deletions.
2 changes: 1 addition & 1 deletion BigQueryDataTransfer/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Bigtable/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Container/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Core/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion Dataproc/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Debugger/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion Dialogflow/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Dlp/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ErrorReporting/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Firestore/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion Iot/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Kms/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Language/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Logging/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Monitoring/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion OsLogin/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion PubSub/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Redis/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"require": {
"ext-grpc": "*",
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Spanner/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion Spanner/src/V1/Gapic/SpannerGapicClient.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],
Expand Down
116 changes: 0 additions & 116 deletions Spanner/src/V1/resources/spanner_grpc_config.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Speech/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion TextToSpeech/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
},
"require": {
"google/gax": "^0.37"
"google/gax": "^0.36"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion Trace/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion VideoIntelligence/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Vision/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -213,4 +213,4 @@
]
}
}
}
}

0 comments on commit e646b9c

Please sign in to comment.