diff --git a/CommonProtos/composer.json b/CommonProtos/composer.json index 5cf6c9c042b7..adbb42cb969e 100644 --- a/CommonProtos/composer.json +++ b/CommonProtos/composer.json @@ -7,7 +7,7 @@ "license": "Apache-2.0", "require": { "google/protobuf": "^3.7.1", - "google/common-protos": "^1.0" + "google/common-protos": "^1.0||^2.0" }, "require-dev": { "phpunit/phpunit": "^4.8.36" diff --git a/Core/composer.json b/Core/composer.json index d0f68f35d91d..8fac5b0b52ce 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -20,7 +20,7 @@ "erusev/parsedown": "^1.6", "google/gax": "^1.9", "opis/closure": "^3", - "google/common-protos": "^1.0" + "google/common-protos": "^1.0||^2.0" }, "suggest": { "opis/closure": "May be used to serialize closures to process jobs in the batch daemon. Please require version ^3.", diff --git a/IamCredentials/composer.json b/IamCredentials/composer.json index 78b243cc9a3f..dabaad49749a 100644 --- a/IamCredentials/composer.json +++ b/IamCredentials/composer.json @@ -24,7 +24,7 @@ }, "require": { "google/gax": "^1.7.0", - "google/common-protos": "^1.3.1" + "google/common-protos": "^1.3.1||^2.0" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/ServiceControl/composer.json b/ServiceControl/composer.json index 4614955e73bb..5089a87fb1c9 100644 --- a/ServiceControl/composer.json +++ b/ServiceControl/composer.json @@ -24,7 +24,7 @@ }, "require": { "google/gax": "^1.7.0", - "google/common-protos": "^1.3.1" + "google/common-protos": "^1.3.1||^2.0" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/ServiceManagement/composer.json b/ServiceManagement/composer.json index e11c6eadb782..f093ddc8c0ef 100644 --- a/ServiceManagement/composer.json +++ b/ServiceManagement/composer.json @@ -24,7 +24,7 @@ }, "require": { "google/gax": "^1.7.0", - "google/common-protos": "^1.3.1" + "google/common-protos": "^1.3.1||^2.0" }, "require-dev": { "phpunit/phpunit": "^4.8|^5.0", diff --git a/composer.json b/composer.json index 07133c950c76..ec945c696ef0 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "psr/http-message": "1.0.*", "ramsey/uuid": "^3.0|^4.0", "google/gax": "^1.9", - "google/common-protos": "^1.3.1", + "google/common-protos": "^1.3.1||^2.0", "google/auth": "^1.18", "google/crc32": "^0.1.0" },