From 201a3337bf26c1b59461c6a0142c7811605384d7 Mon Sep 17 00:00:00 2001 From: Benjamin Walker Date: Thu, 14 Nov 2024 11:58:27 +1000 Subject: [PATCH] Add proper support for Moodle 4.4 --- .github/workflows/ci.yml | 4 +--- README.md | 7 ++++--- classes/sns_client.php | 2 -- classes/task/update_suppression_list.php | 6 ------ tests/suppressionlist_test.php | 6 ------ version.php | 9 ++++----- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be91511..25b07af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,4 @@ jobs: with: disable_behat: true disable_grunt: true - disable_mustache: true - extra_plugin_runners: | - moodle-plugin-ci add-plugin catalyst/moodle-local_aws \ No newline at end of file + disable_mustache: true \ No newline at end of file diff --git a/README.md b/README.md index 7747e06..95e3784 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ A rough roadmap with no set timelines: ## Branches The following lists the supported branch to use based on your Moodle version. -| Moodle version | Branch | -|----------------|------------------| -| Moodle 3.9+ | MOODLE_39_STABLE | +| Moodle version | Branch | +|----------------|-------------------| +| Moodle 3.9-4.3 | MOODLE_39_STABLE | +| Moodle 4.4+ | MOODLE_404_STABLE | ## Installation diff --git a/classes/sns_client.php b/classes/sns_client.php index 256f5f5..f5b4b4d 100644 --- a/classes/sns_client.php +++ b/classes/sns_client.php @@ -27,8 +27,6 @@ defined('MOODLE_INTERNAL') || die; -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\Sns\Exception\InvalidSnsMessageException; use Aws\Sns\Message; use Aws\Sns\MessageValidator; diff --git a/classes/task/update_suppression_list.php b/classes/task/update_suppression_list.php index 5eec1bb..f4a6cfc 100644 --- a/classes/task/update_suppression_list.php +++ b/classes/task/update_suppression_list.php @@ -27,12 +27,6 @@ defined('MOODLE_INTERNAL') || die(); -if (!class_exists('\Aws\SesV2\SesV2Client')) { - if (file_exists($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php')) { - require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - } -} - /** * Scheduled task class for updating the email suppression list. * diff --git a/tests/suppressionlist_test.php b/tests/suppressionlist_test.php index ab6bff5..bb8678c 100644 --- a/tests/suppressionlist_test.php +++ b/tests/suppressionlist_test.php @@ -19,12 +19,6 @@ global $CFG; -if (!class_exists('\Aws\SesV2\SesV2Client')) { - if (file_exists($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php')) { - require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - } -} - /** * Test case for suppression list functionality. * diff --git a/version.php b/version.php index be6894c..66b5a34 100644 --- a/version.php +++ b/version.php @@ -25,10 +25,9 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2024101700; -$plugin->release = 2024101700; -$plugin->requires = 2020061500; +$plugin->version = 2024111300; +$plugin->release = 2024111300; +$plugin->requires = 2024042200; $plugin->component = 'tool_emailutils'; -$plugin->dependencies = ['local_aws' => 2020061500]; $plugin->maturity = MATURITY_STABLE; -$plugin->supported = [39, 404]; +$plugin->supported = [404, 405];