Skip to content

Commit

Permalink
Merge pull request #4401 from nextcloud/update-main-version
Browse files Browse the repository at this point in the history
feat(deps): Add Nextcloud 32 support on main
  • Loading branch information
elzody authored Jan 23, 2025
2 parents 04938a4 + c2b80f4 commit e5bd519
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
9 changes: 5 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable28
target-branch: stable29
labels:
- "3. to review"
- "dependencies"
Expand All @@ -74,7 +74,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable29
target-branch: stable30
labels:
- "3. to review"
- "dependencies"
Expand All @@ -86,15 +86,15 @@ updates:
update-types: ["version-update:semver-major", "version-update:semver-minor"]
# Disable automatic rebasing because without a build CI will likely fail anyway
rebase-strategy: "disabled"

- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable30
target-branch: stable31
labels:
- "3. to review"
- "dependencies"
Expand All @@ -106,3 +106,4 @@ updates:
update-types: ["version-update:semver-major", "version-update:semver-minor"]
# Disable automatic rebasing because without a build CI will likely fail anyway
rebase-strategy: "disabled"

2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

name: npm-audit-fix-${{ matrix.branches }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
<version>8.6.0-beta.1</version>
<version>9.0.0-dev.0</version>
<licence>agpl</licence>
<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
<types>
Expand All @@ -30,7 +30,7 @@ You can also edit your documents off-line with the Collabora Office app from the
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
<dependencies>
<nextcloud min-version="31" max-version="31"/>
<nextcloud min-version="32" max-version="32"/>
</dependencies>
<background-jobs>
<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "richdocuments",
"description": "Collabora online integration",
"version": "8.6.0-beta.1",
"version": "9.0.0-dev.0",
"authors": [
{
"name": "Julius Härtl",
Expand Down

0 comments on commit e5bd519

Please sign in to comment.