Skip to content

Commit

Permalink
Merge pull request #225 from sualko/nc-25
Browse files Browse the repository at this point in the history
Prepare release for Nextcloud 25
  • Loading branch information
sualko authored Oct 26, 2022
2 parents c9f017a + e1c5560 commit bc3ae05
Show file tree
Hide file tree
Showing 41 changed files with 356 additions and 703 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [7.2, 7.3, 7.4, 8.0]
php-versions: [7.3, 7.4, 8.0]
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/php-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ jobs:
strategy:
matrix:
php-versions: ['7.4', '8']
nextcloud-versions: ['stable22', 'stable23', 'stable24']
include:
- php-versions: '7.3'
nextcloud-versions: 'stable22'
- php-versions: '7.3'
nextcloud-versions: 'stable23'
nextcloud-versions: ['stable23', 'stable24', 'stable25']
name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
env:
CI: true
Expand All @@ -39,7 +34,7 @@ jobs:
path: nextcloud/apps/bbb
- name: Update test stub
working-directory: nextcloud/apps/bbb
run: composer update friendsofphp/php-cs-fixer christophwurst/nextcloud -W
run: composer update friendsofphp/php-cs-fixer nextcloud/ocp -W
- name: Install dependencies
working-directory: nextcloud/apps/bbb
run: composer install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ocp-version: [ 'dev-stable24', 'dev-stable23', 'dev-stable22' ]
ocp-version: [ 'dev-stable25', 'dev-stable24', 'dev-stable23' ]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: composer i
- name: Install dependencies
run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }}
- name: Run coding standards check
run: composer run psalm

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ node_modules/
/archives/
.phpunit.result.cache
.vscode/settings.json
.php-cs-fixer.cache
File renamed without changes.
5 changes: 0 additions & 5 deletions appinfo/app.php

This file was deleted.

4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha
*This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.*
]]></description>
<version>2.3.1</version>
<version>2.4.0-alpha</version>
<licence>agpl</licence>
<author mail="[email protected]">Klaus Herberth</author>
<namespace>BigBlueButton</namespace>
Expand All @@ -43,7 +43,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha
<lib>curl</lib>
<lib>mbstring</lib>
<lib>SimpleXML</lib>
<nextcloud min-version="22" max-version="24"/>
<nextcloud min-version="23" max-version="25"/>
</dependencies>
<commands>
<command>OCA\BigBlueButton\Command\ClearAvatarCache</command>
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^9.3",
"friendsofphp/php-cs-fixer": "^2.16",
"nextcloud/coding-standard": "^0.5.0",
"friendsofphp/php-cs-fixer": "^3",
"nextcloud/coding-standard": "^1.0.0",
"phpstan/phpstan": "^0.12.29",
"christophwurst/nextcloud": "^22.0 || ^23.0 || ^24.0",
"nextcloud/ocp": "^23.0 || ^24.0 || ^25.0",
"vimeo/psalm": "^4.5"
},
"config": {
Expand Down
Loading

0 comments on commit bc3ae05

Please sign in to comment.