From 2b7d85f389f750c686d212c7fe94447f61b529e7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 23 Nov 2023 14:20:25 +0100
Subject: [PATCH 1/2] feat(deps): Add Nextcloud 29 support on master

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

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 41b5569ae..1617bf18e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -41,7 +41,7 @@ updates:
       day: saturday
       time: "03:00"
       timezone: Europe/Paris
-    target-branch: stable27
+    target-branch: stable28
     labels:
       - "3. to review"
       - "dependencies"
@@ -57,7 +57,7 @@ updates:
       day: saturday
       time: "03:00"
       timezone: Europe/Paris
-    target-branch: stable26
+    target-branch: stable27
     labels:
       - "3. to review"
       - "dependencies"
@@ -73,7 +73,7 @@ updates:
       day: saturday
       time: "03:00"
       timezone: Europe/Paris
-    target-branch: stable25
+    target-branch: stable26
     labels:
       - "3. to review"
       - "dependencies"
@@ -81,3 +81,4 @@ updates:
       # ignore all GitHub linguist patch updates
       - dependency-name: "*"
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index 039530e91..cb63db7e3 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["main", "master", "stable27", "stable26", "stable25", "stable24"]
+        branches: ["main", "master", "stable28", "stable27", "stable26", "stable25", "stable24"]
   
     name: npm-audit-fix-${{ matrix.branches }}
 
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 3f9625d63..ad02ffea4 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
         server-versions: ['master']
 
     services:
diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml
index b1bb995b8..a0be93fc6 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", "stable27", "stable26", "stable25"]
+        branches: ["main", "master", "stable28", "stable27", "stable26"]
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index b1629ede3..6a82d185d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -8,7 +8,7 @@
 The First run wizard can be customized to meet specific design goals, or to change links and messages. Create an appropriate theme following the Theming documentation, and changes to the look and feel of this Wizard are simple. More information is available in the first run wizard documentation, as well as the theming documentation.
 </description>
 
-	<version>2.17.0</version>
+	<version>2.18.0</version>
 	<licence>agpl</licence>
 	<author>Frank Karlitschek</author>
 	<author>Jan-Christoph Borchardt</author>
@@ -26,7 +26,7 @@ The First run wizard can be customized to meet specific design goals, or to chan
 	<repository>https://github.com/nextcloud/firstrunwizard.git</repository>
 
 	<dependencies>
-		<nextcloud min-version="28" max-version="28" />
+		<nextcloud min-version="29" max-version="29" />
 	</dependencies>
 
 	<settings>
diff --git a/package-lock.json b/package-lock.json
index 643361d77..64973d60b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "firstrunwizard",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firstrunwizard",
-      "version": "2.17.0",
+      "version": "2.18.0",
       "license": "agpl",
       "dependencies": {
         "@nextcloud/axios": "^2.4.0",
diff --git a/package.json b/package.json
index 6eab91368..dd3d41456 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firstrunwizard",
   "description": "",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "author": "Julius Härtl <jus@bitgrid.net>",
   "license": "agpl",
   "private": true,

From 878e32bb497df30248529f1aa8cfd7a7c79f2072 Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Thu, 23 Nov 2023 14:37:56 +0100
Subject: [PATCH 2/2] Update workflow

Signed-off-by: Simon L. <szaimen@e.mail.de>
---
 .github/workflows/npm-audit-fix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index cb63db7e3..4ef4d7b72 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["main", "master", "stable28", "stable27", "stable26", "stable25", "stable24"]
+        branches: ["main", "master", "stable28", "stable27", "stable26", "stable25"]
   
     name: npm-audit-fix-${{ matrix.branches }}