Skip to content

Commit

Permalink
Fixes MonoRepo inconsistencies and bumps dependencies for Laravel 9.
Browse files Browse the repository at this point in the history
  • Loading branch information
Aidan Casey committed Jan 19, 2022
1 parent 811fe4f commit 0eae47f
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 8,255 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.0]
laravel: [8.*]
php: [8.0, 8.1]
laravel: [8.*, 9.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 8.*
testbench: 6.*
- laravel: 9.*
testbench: 7.*
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/vendor
.phpunit.result.cache
composer.lock
37 changes: 27 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,22 @@
{
"name": "Dan Harrin",
"email": "[email protected]"
},
{
"name": "Krzysztof Rewak",
"email": "[email protected]"
}
],
"require": {
"php": "^8.0",
"illuminate/contracts": "^8.0",
"illuminate/database": "^8.0",
"illuminate/support": "^8.0",
"akaunting/laravel-money": "^1.2"
"akaunting/laravel-money": "^1.2",
"ext-pdo_sqlite": "*",
"illuminate/contracts": "^9.0",
"illuminate/database": "^8.40|^9.0",
"illuminate/support": "^8.0|^9.0",
"php": "^8.0"
},
"require-dev": {
"orchestra/testbench": "^6.2",
"orchestra/testbench": "^6.2|^7.0",
"phpunit/phpunit": "^9.4",
"symplify/monorepo-builder": "^9.0"
},
Expand All @@ -27,11 +32,13 @@
"packages/airports/src",
"packages/continents-de/src",
"packages/continents-en/src",
"packages/continents-pl/src",
"packages/continents/src",
"packages/countries-de/src",
"packages/countries-en/src",
"packages/countries-es/src",
"packages/countries-fr/src",
"packages/countries-pl/src",
"packages/countries/src",
"packages/currencies-en/src",
"packages/currencies/src",
Expand All @@ -55,6 +62,8 @@
"extra": {
"laravel": {
"providers": [
"Squire\\GbCountiesServiceProvider",
"Squire\\ContinentsEnServiceProvider",
"Squire\\AirportsServiceProvider",
"Squire\\CountriesDeServiceProvider",
"Squire\\AirlinesServiceProvider",
Expand All @@ -64,16 +73,19 @@
"Squire\\GbCountiesEnServiceProvider",
"Squire\\AirlinesEnServiceProvider",
"Squire\\CountriesEnServiceProvider",
"Squire\\ContinentsDeServiceProvider",
"Squire\\CountriesFrServiceProvider",
"Squire\\CountriesEsServiceProvider",
"Squire\\TimezonesEnServiceProvider",
"Squire\\CountriesPlServiceProvider",
"Squire\\TimezonesServiceProvider",
"Squire\\ContinentsServiceProvider",
"Squire\\AirportsEnServiceProvider",
"Squire\\CurrenciesEnServiceProvider",
"Squire\\ContinentsPlServiceProvider",
"Squire\\CurrenciesServiceProvider",
"Squire\\RegionsServiceProvider",
"Squire\\RepositoryServiceProvider",
"Squire\\TimezonesServiceProvider",
"Squire\\TimezonesEnServiceProvider"
"Squire\\RepositoryServiceProvider"
],
"aliases": {
"RepositoryManager": "Squire\\Repository\\Facades\\Repository"
Expand All @@ -86,12 +98,15 @@
"squirephp/airports": "self.version",
"squirephp/airports-en": "self.version",
"squirephp/continents": "self.version",
"squirephp/continents-de": "self.version",
"squirephp/continents-en": "self.version",
"squirephp/continents-pl": "self.version",
"squirephp/countries": "self.version",
"squirephp/countries-de": "self.version",
"squirephp/countries-en": "self.version",
"squirephp/countries-es": "self.version",
"squirephp/countries-fr": "self.version",
"squirephp/countries-pl": "self.version",
"squirephp/currencies": "self.version",
"squirephp/currencies-en": "self.version",
"squirephp/gb-counties": "self.version",
Expand All @@ -103,5 +118,7 @@
"squirephp/rule": "self.version",
"squirephp/timezones": "self.version",
"squirephp/timezones-en": "self.version"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
Loading

0 comments on commit 0eae47f

Please sign in to comment.