Merge pull request #140 from pdsinterop/fix/poddit-launcher

Fixes for legacy solid apps (poddit launcher in solid-nextcloud)

.github/workflows/ci.yml

@@ -31,9 +31,9 @@ jobs:
  # For the latest version information see: https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule
  # Versions before 22 are not tested as they run on PHP versions lower than 8.0
  # Versions before 24 are not tested as they do not support `.well-known` entries
+ # Version 24 comes with PHP 8.0, which is no longer supported;
  # Latest is not tested here, as that could cause failures unrelated to project changes
  nextcloud_version:
- - 24
  - 25
 
  steps:
@@ -80,15 +80,14 @@ jobs:
  fail-fast: false
  matrix:
  nextcloud_version:
- - 24
  - 25
  test:
  - 'solidtestsuite/solid-crud-tests:v7.0.5'
  - 'solidtestsuite/web-access-control-tests:v7.1.0'
  - 'solidtestsuite/webid-provider-tests:v2.1.0'
 
  # Prevent EOL or non-stable versions of Nextcloud to fail the test-suite
- continue-on-error: ${{ contains(fromJson('[24, 25]'), matrix.nextcloud_version) == false }}
+ continue-on-error: ${{ contains(fromJson('[25]'), matrix.nextcloud_version) == false }}
 
  steps:
  - name: Create docker tag from git reference

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

@@ -20,7 +20,7 @@ jobs:
 
  strategy:
  matrix:
- php: ['8.0', '8.1']
+ php: ['8.1']
 
  steps:
  - name: Checkout code

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

@@ -17,7 +17,7 @@ jobs:
  php-codesniffer:
  strategy:
  matrix:
- php: [ '8.0', '8.1' ]
+ php: [ '8.1' ]
  runs-on: ubuntu-20.04
  steps:
  - uses: actions/checkout@v3

solid/appinfo/info.xml

@@ -18,10 +18,10 @@ IMPORTANT: See https://github.com/pdsinterop/solid-nextcloud/blob/main/INSTALL.m
  <category>integration</category>
  <bugs>https://github.com/pdsinterop/solid-nextcloud/issues</bugs>
  <dependencies>
- <nextcloud min-version="24" max-version="25"/>
+ <nextcloud min-version="25" max-version="25"/>
  </dependencies>
  <settings>
- <admin>OCASolidSettings</admin>
+ <admin>\OCA\Solid\Settings</admin>
  </settings>
  <navigations>
  <navigation>

solid/composer.json

@@ -21,7 +21,7 @@
  }
  ],
  "require": {
- "php": "^8.0",
+ "php": "^8.1",
  "ext-dom": "*",
  "ext-json": "*",
  "ext-mbstring": "*",
@@ -31,8 +31,8 @@
  "lcobucci/jwt": "^4.1",
  "pdsinterop/flysystem-nextcloud": "^0.2",
  "pdsinterop/flysystem-rdf": "^0.5",
- "pdsinterop/solid-auth": "v0.10.2",
- "pdsinterop/solid-crud": "^0.7.1",
+ "pdsinterop/solid-auth": "v0.10.3",
+ "pdsinterop/solid-crud": "^0.7.3",
  "psr/log": "^1.1"
  },
  "require-dev": {