From 73f96bff73837c4c7430b4229cca2f9ff5fabe87 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 13:09:59 +0100 Subject: [PATCH] feat(deps): Add Nextcloud 30 support on main Signed-off-by: Joas Schilling --- .github/dependabot.yml | 5 ----- .github/workflows/update-nextcloud-ocp.yml | 2 +- appinfo/info.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5f790238c3..d8c1ff5a12 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,11 +19,6 @@ updates: time: "03:00" timezone: Europe/Paris open-pull-requests-limit: 10 - ignore: - - dependency-name: christophwurst/nextcloud - versions: - - ">= 18.a" - - "< 19" - package-ecosystem: composer directory: "/tests" schedule: diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index a3945d5e54..af3988b76e 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable28', 'stable27', 'stable26'] + branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index fa9fcda525..df2efc8d0e 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,7 +6,7 @@ - 8.4.0-beta.2 + 8.5.0-dev.0 agpl Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk @@ -25,7 +25,7 @@ You can also edit your documents off-line with the Collabora Office app from the https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png - + OCA\Richdocuments\Backgroundjobs\ObtainCapabilities diff --git a/package-lock.json b/package-lock.json index f09df430f4..8e47d0cf94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "richdocuments", - "version": "8.4.0-beta.1", + "version": "8.5.0-dev.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "richdocuments", - "version": "8.4.0-beta.1", + "version": "8.5.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/auth": "^2.2.1", diff --git a/package.json b/package.json index ecd6dab397..e6eae582c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "richdocuments", "description": "Collabora online integration", - "version": "8.4.0-beta.2", + "version": "8.5.0-dev.0", "authors": [ { "name": "Julius Härtl", @@ -85,4 +85,4 @@ ], "globalSetup": "/src/tests/setup.js" } -} \ No newline at end of file +}