From bcda6b28ca357bb9d394d83d8fe9632c8bcc83b6 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Fri, 5 Jan 2024 11:17:17 -0600 Subject: [PATCH] fix: define lowest deps correctly (#6941) --- .github/run-package-tests.sh | 4 ++-- AlloyDb/composer.json | 3 ++- Channel/composer.json | 3 ++- Core/composer.json | 4 ++-- LongRunning/composer.json | 1 + composer.json | 6 +++--- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/run-package-tests.sh b/.github/run-package-tests.sh index 4a4245e1a653..2f099d5d6ea9 100644 --- a/.github/run-package-tests.sh +++ b/.github/run-package-tests.sh @@ -38,11 +38,11 @@ for DIR in ${DIRS}; do { done echo "Installing composer in $DIR" - COMPOSER_ROOT_VERSION=$(cat $DIR/VERSION) composer -q --no-interaction --no-ansi --no-progress update -d ${DIR}; + composer -q --no-interaction --no-ansi --no-progress update -d ${DIR}; if [ $? != 0 ]; then echo "$DIR: composer install failed" >> "${FAILED_FILE}" # run again but without "-q" so we can see the error - COMPOSER_ROOT_VERSION=$(cat $DIR/VERSION) composer --no-interaction --no-ansi --no-progress update -d ${DIR}; + composer --no-interaction --no-ansi --no-progress update -d ${DIR}; continue fi echo "Running $DIR Unit Tests" diff --git a/AlloyDb/composer.json b/AlloyDb/composer.json index 886e1c46dc8c..6b2c461bd9a6 100644 --- a/AlloyDb/composer.json +++ b/AlloyDb/composer.json @@ -18,7 +18,8 @@ }, "require": { "php": ">=7.4", - "google/gax": "^1.26.0" + "google/gax": "^1.26.0", + "google/common-protos": "^4.4" }, "require-dev": { "phpunit/phpunit": "^9.0" diff --git a/Channel/composer.json b/Channel/composer.json index 09a0542005c7..16d01f2eddab 100644 --- a/Channel/composer.json +++ b/Channel/composer.json @@ -24,7 +24,8 @@ }, "require": { "php": ">=7.4", - "google/gax": "^1.26.0" + "google/gax": "^1.26.0", + "google/common-protos": "^3.2||^4.0" }, "require-dev": { "phpunit/phpunit": "^9.0" diff --git a/Core/composer.json b/Core/composer.json index dc00d87115e9..2dd6a68482e3 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -9,8 +9,8 @@ "google/auth": "^1.34.0", "guzzlehttp/guzzle": "^6.5.8|^7.4.4", "guzzlehttp/promises": "^1.4||^2.0", - "guzzlehttp/psr7": "^1.7|^2.0", - "monolog/monolog": "^1.1|^2.0|^3.0", + "guzzlehttp/psr7": "^2.6", + "monolog/monolog": "^2.9|^3.0", "psr/http-message": "^1.0|^2.0" }, "require-dev": { diff --git a/LongRunning/composer.json b/LongRunning/composer.json index 37951d58b1f6..31f9737902af 100644 --- a/LongRunning/composer.json +++ b/LongRunning/composer.json @@ -3,6 +3,7 @@ "description": "Google LongRunning Client for PHP", "license": "Apache-2.0", "minimum-stability": "stable", + "version": "0.2.6", "autoload": { "psr-4": { "Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning", diff --git a/composer.json b/composer.json index 496ceb76297a..90cd8b9571a2 100644 --- a/composer.json +++ b/composer.json @@ -46,12 +46,12 @@ "php": ">=7.4", "rize/uri-template": "~0.3", "guzzlehttp/guzzle": "^6.5.8|^7.4.4", - "guzzlehttp/psr7": "^1.7|^2.0", - "monolog/monolog": "^2.0||^3.0", + "guzzlehttp/psr7": "^2.6", + "monolog/monolog": "^2.9||^3.0", "psr/http-message": "^1.0|^2.0", "ramsey/uuid": "^4.0", "google/gax": "^1.26.0", - "google/common-protos": "^4.0", + "google/common-protos": "^4.4", "google/auth": "^1.34.0" }, "require-dev": {