From 65cfb190898dd3ad7099f2186c05b531e7957e56 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 5 Jan 2025 10:10:28 +0000
Subject: [PATCH 1/4] Bump required MW and SMW versions

* Bumps MW requirements to MW 1.39+
* Bumps SMW requirements to 4.0+
---
 extension.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension.json b/extension.json
index a4433cf..a32332a 100644
--- a/extension.json
+++ b/extension.json
@@ -12,9 +12,9 @@
 	"license-name": "GPL-2.0-or-later",
 	"type": "semantic",
 	"requires": {
-		"MediaWiki": ">= 1.31",
+		"MediaWiki": ">= 1.39",
 		"extensions": {
-			"SemanticMediaWiki": ">= 3.0"
+			"SemanticMediaWiki": ">= 4.0"
 		}
 	},
 	"MessagesDirs": {

From 72fd7a0c436e8049681774d0c699fa7a74f0cfcf Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 5 Jan 2025 10:10:59 +0000
Subject: [PATCH 2/4] Update extension.json

---
 extension.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.json b/extension.json
index a32332a..48f320f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
   "name": "SemanticCompoundQueries",
-	"version": "2.2.0",
+	"version": "3.0.0-beta",
 	"author": [
 		"James Hong Kong",
 		"Yaron Koren",

From df5add3b35bfadb050884f31c975c738fb51c0a2 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 5 Jan 2025 10:11:41 +0000
Subject: [PATCH 3/4] Update Makefile

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 857b85b..55bf3d7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,13 @@ endif
 EXTENSION=SemanticCompoundQueries
 
 # docker images
-MW_VERSION?=1.35
-PHP_VERSION?=7.4
-DB_TYPE?=sqlite
-DB_IMAGE?=""
+MW_VERSION?=1.39
+PHP_VERSION?=8.1
+DB_TYPE?=mysql
+DB_IMAGE?="mariadb:10"
 
 # extensions
-SMW_VERSION?=4.1.2
+SMW_VERSION?=4.2.0
 
 # composer
 # Enables "composer update" inside of extension

From bc0240ed27db8455452bd6fa161ff62d032238f6 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 5 Jan 2025 10:12:10 +0000
Subject: [PATCH 4/4] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4f508fe..10d8f89 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 		"source": "https://github.com/SemanticCompoundQueries/SemanticCompoundQueries"
 	},
 	"require": {
-		"php": ">=7.3",
+		"php": ">=7.4",
 		"composer/installers": "^2|^1.0.1"
 	},
 	"require-dev": {
@@ -35,7 +35,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.x-dev"
+			"dev-master": "3.x-dev"
 		}
 	},
 	"autoload": {