Skip to content

Commit

Permalink
Merge pull request #338 from nextcloud/nextcloud-30
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Aug 13, 2024
2 parents 1385581 + 48e92d0 commit 14ced48
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 116 deletions.
8 changes: 4 additions & 4 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ Allow your users to temporary lock their files to avoid conflicts while working
<repository>https://github.com/nextcloud/files_lock.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/files_lock/main/screenshots/0.7.0.png</screenshot>

<dependencies>
<nextcloud min-version="30" max-version="30"/>
</dependencies>

<background-jobs>
<job>OCA\FilesLock\Cron\Unlock</job>
</background-jobs>
Expand All @@ -45,8 +49,4 @@ Allow your users to temporary lock their files to avoid conflicts while working
<plugin>OCA\FilesLock\DAV\LockPlugin</plugin>
</plugins>
</sabre>

<dependencies>
<nextcloud min-version="30" max-version="30"/>
</dependencies>
</info>
40 changes: 20 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "nextcloud/files_lock",
"require-dev": {
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^1.0",
"psalm/phar": "^5.2",
"sabre/dav": "^4.3",
"nextcloud/ocp": "dev-master"
},
"name": "nextcloud/files_lock",
"require-dev": {
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^1.2",
"psalm/phar": "^5.25",
"sabre/dav": "^4.6",
"nextcloud/ocp": "dev-master"
},
"config": {
"platform": {
"php": "8.0"
"php": "8.1"
}
},
"license": "AGPL",
"require": {
"php": "^8.0"
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"psalm": "psalm.phar",
"test:unit": "phpunit -c tests/phpunit.xml"
},
"license": "AGPL",
"require": {
"php": "^8.1"
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"psalm": "psalm.phar",
"test:unit": "phpunit -c tests/phpunit.xml"
},
"autoload-dev": {
"psr-4": {
"OCP\\": "vendor/nextcloud/ocp/OCP"
Expand Down
Loading

0 comments on commit 14ced48

Please sign in to comment.