Merge pull request #6 from civicrm/master-php83

composer.json - Switch to civicrm/gitignore fork (w/php82+ support)
civicrm · Apr 9, 2024 · a1eb770 · a1eb770
2 parents 86ae710 + e305f03
commit a1eb770
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         php: [7.2, 7.3, 7.4, 8.0, 8.1]
         os: [ubuntu-latest]
-        composer: [v1, v2]
+        composer: [v2]
     name: ${{ matrix.php }} - PHPUnit - Composer ${{ matrix.composer }}
     steps:
       - uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "composer-plugin-api": "^1.1 || ^2.0",
+        "composer-plugin-api": "^2.0",
         "php": ">=7.2",
-        "togos/gitignore": "~1.1.1"
+        "civicrm/gitignore": "~1.2.0"
     },
     "require-dev": {
-        "composer/composer": "~1.0 || ~2.0",
+        "composer/composer": "~2.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "friendsofphp/php-cs-fixer": "^2.3",
         "totten/process-helper": "^1.0.1"