From 78b785d603e9113be629b0429bc3da0c6c8cc4f4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Aug 2024 13:27:59 +0200
Subject: [PATCH 1/2] feat(deps): Add Nextcloud 31 support on main

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/dependabot.yml                     | 12 ++++++------
 .github/workflows/update-nextcloud-ocp.yml |  2 +-
 appinfo/info.xml                           |  4 ++--
 package-lock.json                          |  4 ++--
 package.json                               |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c9f6b0ebce1..13291690b2a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -63,7 +63,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable29
+  target-branch: stable30
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
@@ -76,7 +76,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable28
+  target-branch: stable29
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
@@ -89,7 +89,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable27
+  target-branch: stable28
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
@@ -102,7 +102,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable29
+  target-branch: stable30
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
@@ -115,7 +115,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable28
+  target-branch: stable29
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
@@ -128,7 +128,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable27
+  target-branch: stable28
   open-pull-requests-limit: 10
   ignore:
     # ignore all GitHub linguist patch updates
diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml
index 6e705cc8c43..bbeec0c6e15 100644
--- a/.github/workflows/update-nextcloud-ocp.yml
+++ b/.github/workflows/update-nextcloud-ocp.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable29', 'stable28', 'stable27']
+        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index e90607f3274..c5243f4c29a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>20.0.0-beta.3</version>
+	<version>21.0.0-dev.0</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
@@ -55,7 +55,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/spreed/main/docs/video-verfication.png</screenshot>
 
 	<dependencies>
-		<nextcloud min-version="30" max-version="30" />
+		<nextcloud min-version="31" max-version="31" />
 	</dependencies>
 
 	<background-jobs>
diff --git a/package-lock.json b/package-lock.json
index 88b27e60028..1d3cd5aef18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "20.0.0-beta.3",
+  "version": "21.0.0-dev.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "20.0.0-beta.3",
+      "version": "21.0.0-dev.0",
       "license": "agpl",
       "dependencies": {
         "@linusborg/vue-simple-portal": "^0.1.5",
diff --git a/package.json b/package.json
index 1b4da2ac4f2..6e73abebfef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "20.0.0-beta.3",
+  "version": "21.0.0-dev.0",
   "private": true,
   "description": "",
   "author": "Joas Schilling <coding@schilljs.com>",

From 53f4328a847cd5b49dddd2f9764c4bf0951a559c Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 15 Aug 2024 08:18:24 +0200
Subject: [PATCH 2/2] feat(deps): Add Nextcloud 31 support to cheat app

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/spreedcheats/appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/spreedcheats/appinfo/info.xml b/tests/integration/spreedcheats/appinfo/info.xml
index 665a33b1184..f7a2cd62b50 100644
--- a/tests/integration/spreedcheats/appinfo/info.xml
+++ b/tests/integration/spreedcheats/appinfo/info.xml
@@ -11,13 +11,13 @@
 
 	<licence>AGPL</licence>
 	<author>Joas Schilling</author>
-	<version>2.6.0</version>
+	<version>21.0.0</version>
 
 	<types>
 		<logging/>
 	</types>
 
 	<dependencies>
-		<nextcloud min-version="30" max-version="30" />
+		<nextcloud min-version="31" max-version="31" />
 	</dependencies>
 </info>