Skip to content

Commit 407822f

Browse files
authored
Merge pull request #140 from pdsinterop/fix/poddit-launcher
Fixes for legacy solid apps (poddit launcher in solid-nextcloud)
2 parents 7378bc2 + d38df18 commit 407822f

17 files changed

+489
-405
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
# For the latest version information see: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule
3232
# Versions before 22 are not tested as they run on PHP versions lower than 8.0
3333
# Versions before 24 are not tested as they do not support `.well-known` entries
34+
# Version 24 comes with PHP 8.0, which is no longer supported;
3435
# Latest is not tested here, as that could cause failures unrelated to project changes
3536
nextcloud_version:
36-
- 24
3737
- 25
3838

3939
steps:
@@ -80,15 +80,14 @@ jobs:
8080
fail-fast: false
8181
matrix:
8282
nextcloud_version:
83-
- 24
8483
- 25
8584
test:
8685
- 'solidtestsuite/solid-crud-tests:v7.0.5'
8786
- 'solidtestsuite/web-access-control-tests:v7.1.0'
8887
- 'solidtestsuite/webid-provider-tests:v2.1.0'
8988

9089
# Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
91-
continue-on-error: ${{ contains(fromJson('[24, 25]'), matrix.nextcloud_version) == false }}
90+
continue-on-error: ${{ contains(fromJson('[25]'), matrix.nextcloud_version) == false }}
9291

9392
steps:
9493
- name: Create docker tag from git reference

.github/workflows/dependancy-security-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
php: ['8.0', '8.1']
23+
php: ['8.1']
2424

2525
steps:
2626
- name: Checkout code

.github/workflows/php-version-sniff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
php-codesniffer:
1818
strategy:
1919
matrix:
20-
php: [ '8.0', '8.1' ]
20+
php: [ '8.1' ]
2121
runs-on: ubuntu-20.04
2222
steps:
2323
- uses: actions/checkout@v3

solid/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ IMPORTANT: See https://github.com/pdsinterop/solid-nextcloud/blob/main/INSTALL.m
1818
<category>integration</category>
1919
<bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
2020
<dependencies>
21-
<nextcloud min-version="24" max-version="25"/>
21+
<nextcloud min-version="25" max-version="25"/>
2222
</dependencies>
2323
<settings>
24-
<admin>OCASolidSettings</admin>
24+
<admin>\OCA\Solid\Settings</admin>
2525
</settings>
2626
<navigations>
2727
<navigation>

solid/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^8.0",
24+
"php": "^8.1",
2525
"ext-dom": "*",
2626
"ext-json": "*",
2727
"ext-mbstring": "*",
@@ -31,8 +31,8 @@
3131
"lcobucci/jwt": "^4.1",
3232
"pdsinterop/flysystem-nextcloud": "^0.2",
3333
"pdsinterop/flysystem-rdf": "^0.5",
34-
"pdsinterop/solid-auth": "v0.10.2",
35-
"pdsinterop/solid-crud": "^0.7.1",
34+
"pdsinterop/solid-auth": "v0.10.3",
35+
"pdsinterop/solid-crud": "^0.7.3",
3636
"psr/log": "^1.1"
3737
},
3838
"require-dev": {

0 commit comments

Comments
 (0)