fix: allow v2.0 for common protos (#5031)

googleapis · Jan 27, 2022 · 580b8db · 580b8db
1 parent e13eac3
commit 580b8db
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     },