Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
forxer committed Oct 26, 2023
2 parents bce0e7f + 986db71 commit 7dc3a0d
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 6 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/generate-glossary export-ignore
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

1.3.0 (2023-10-26)
------------------

- Removed support for Laravel 9 and 8 versions for development


1.2.1 (2023-05-10)
------------------

Expand Down
15 changes: 10 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"laravel-lang/publisher": "^14.0"
},
"require-dev": {
"illuminate/filesystem": "^8.0 || ^9.0 || ^10.0",
"illuminate/support": "^8.0 || ^9.0 || ^10.0",
"laravel-lang/status-generator": "^1.13",
"phpunit/phpunit": "^9.6",
"illuminate/filesystem": "^10.0 || ^11.0",
"illuminate/support": "^10.0 || ^11.0",
"laravel-lang/status-generator": "^1.19",
"phpunit/phpunit": "^10.0",
"symfony/var-dumper": "^6.0"
},
"autoload": {
Expand All @@ -47,5 +47,10 @@
}
},
"minimum-stability": "stable",
"prefer-stable": true
"prefer-stable": true,
"config": {
"allow-plugins": {
"php-http/discovery": true
}
}
}
1 change: 0 additions & 1 deletion src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace GenericTermTranslations;

use GenericTermTranslations\Console\GenerateGlossary;
use Illuminate\Support\ServiceProvider as BaseServiceProvider;
use LaravelLang\Publisher\Plugins\Provider;

Expand Down

0 comments on commit 7dc3a0d

Please sign in to comment.