diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 343ad7147..037b2ba44 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "updateRemoteUserUID": true, "forwardPorts": [80], "containerEnv": { - "NEXTCLOUD_VERSION": "33", + "NEXTCLOUD_VERSION": "34", "NEXTCLOUD_AUTOINSTALL_APPS": "news", "XDEBUG_MODE": "debug" }, diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 45f0ecf75..ee6800397 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -130,7 +130,7 @@ Nextcloud News is an RSS/Atom feed aggregator app for Nextcloud. It's a PHP back cd /home/runner/work/news # Or use: cd $(dirname $(pwd))/.. if in news/news # Step 1: Clone Nextcloud server (adjacent to News repo) -git clone --depth 1 --branch stable32 https://github.com/nextcloud/server.git +git clone --depth 1 --branch stable34 https://github.com/nextcloud/server.git cd server git submodule update --init diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml index 51fa1c00f..6e4c88b45 100644 --- a/.github/workflows/api-integration-tests.yml +++ b/.github/workflows/api-integration-tests.yml @@ -43,7 +43,7 @@ jobs: strategy: matrix: php-versions: ['8.2', '8.3'] - nextcloud: ['stable32'] + nextcloud: ['stable34'] database: ['sqlite', 'pgsql', 'mysql'] experimental: [false] include: diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml index 2350fe4ad..dd50b23a5 100644 --- a/.github/workflows/api-php-static-code-check.yml +++ b/.github/workflows/api-php-static-code-check.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: php-versions: ['8.2', '8.3' ] - nextcloud: [ 'stable32' ] + nextcloud: [ 'stable34' ] database: [ 'sqlite' ] include: - php-versions: 8.3 diff --git a/.github/workflows/api-php-tests.yml b/.github/workflows/api-php-tests.yml index 6827a847d..f26d4bab2 100644 --- a/.github/workflows/api-php-tests.yml +++ b/.github/workflows/api-php-tests.yml @@ -14,12 +14,12 @@ jobs: strategy: matrix: php-versions: ['8.3'] - nextcloud: ['stable32'] + nextcloud: ['stable34'] database: ['sqlite'] experimental: [false] include: - php-versions: 8.3 - nextcloud: stable32 + nextcloud: stable34 database: sqlite experimental: false steps: diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 14f34d92b..e92c1ccde 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: php-versions: ['8.3'] - nextcloud: ['stable32'] + nextcloud: ['stable34'] database: ['sqlite'] steps: - name: Checkout diff --git a/.github/workflows/updater-test.yml b/.github/workflows/updater-test.yml index 082b838cd..eebe9da56 100644 --- a/.github/workflows/updater-test.yml +++ b/.github/workflows/updater-test.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: php-versions: ['8.3'] - nextcloud: ['stable32'] + nextcloud: ['stable34'] database: ['sqlite'] experimental: [false] steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3caf84e99..8468f5de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the # Unreleased ### Added +- Support for Nextcloud Server 34 (Hub 26 spring) (#3786) ### Changed diff --git a/appinfo/info.xml b/appinfo/info.xml index 22d931ab5..0b4e60191 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new) Report a [feed issue](https://github.com/nextcloud/news/discussions/new) ]]> - 28.5.1 + 28.6.0-beta.1 agpl Benjamin Brahmer Sean Molenaar @@ -55,7 +55,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new) json - + diff --git a/composer.json b/composer.json index f893764e3..7df0757cb 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "doctrine/dbal": "^3.10.5", "symfony/console": "^4.4.19", "psr/log": "^1.1.0", - "nextcloud/ocp": "^33.0" + "nextcloud/ocp": "dev-stable34" }, "replace": { "guzzlehttp/guzzle": "*", diff --git a/composer.lock b/composer.lock index 5373d3274..25fce517d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "46f7dcc39de740bbfd05b8be24afb54c", + "content-hash": "bdc9e790d3edd9910574ece0c94a80e3", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -2217,16 +2217,16 @@ }, { "name": "nextcloud/ocp", - "version": "v33.0.5", + "version": "dev-stable34", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "6f53a7ad7eda8c00f335b38e392cb76494d82422" + "reference": "1ce31d2ac587e22269fedd9d5b231c4380d8c5af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6f53a7ad7eda8c00f335b38e392cb76494d82422", - "reference": "6f53a7ad7eda8c00f335b38e392cb76494d82422", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/1ce31d2ac587e22269fedd9d5b231c4380d8c5af", + "reference": "1ce31d2ac587e22269fedd9d5b231c4380d8c5af", "shasum": "" }, "require": { @@ -2234,12 +2234,13 @@ "psr/clock": "^1.0", "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", + "psr/http-client": "^1.0.3", "psr/log": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-stable33": "33.0.0-dev" + "dev-stable34": "34.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -2259,9 +2260,9 @@ "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/v33.0.5" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable34" }, - "time": "2026-05-21T02:07:59+00:00" + "time": "2026-06-04T02:37:14+00:00" }, { "name": "nikic/php-parser", @@ -4373,7 +4374,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "nextcloud/ocp": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {