Merge branch 'develop' into fix/custom-amount-audit-give-033

.github/workflows/wordpress.yml

@@ -52,7 +52,7 @@ jobs:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             -   uses: actions/checkout@v2
             -   name: Cache dependencies
-                uses: actions/cache@v1
+                uses: actions/cache@v3
                 with:
                     path: ~/.composer/cache/files
                     key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

assets/src/css/icons/fa/brands.scss

@@ -2,7 +2,7 @@
  * Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-@import 'assets/src/css/icons/fa/variables';
+@import './variables';
 
 @font-face {
 	font-family: 'Font Awesome 5 Brands';

assets/src/css/icons/fa/fontawesome.scss

@@ -2,15 +2,15 @@
  * Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-@import 'assets/src/css/icons/fa/variables';
-@import 'assets/src/css/icons/fa/mixins';
-@import 'assets/src/css/icons/fa/core';
-@import 'assets/src/css/icons/fa/larger';
-@import 'assets/src/css/icons/fa/fixed-width';
-@import 'assets/src/css/icons/fa/list';
-@import 'assets/src/css/icons/fa/bordered-pulled';
-@import 'assets/src/css/icons/fa/animated';
-@import 'assets/src/css/icons/fa/rotated-flipped';
-@import 'assets/src/css/icons/fa/stacked';
-@import 'assets/src/css/icons/fa/icons';
-@import 'assets/src/css/icons/fa/screen-reader';
+@import './variables';
+@import './mixins';
+@import './core';
+@import './larger';
+@import './fixed-width';
+@import './list';
+@import './bordered-pulled';
+@import './animated';
+@import './rotated-flipped';
+@import './stacked';
+@import './icons';
+@import './screen-reader';

assets/src/css/icons/fa/regular.scss

@@ -2,7 +2,7 @@
  * Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-@import 'assets/src/css/icons/fa/variables';
+@import './variables';
 
 @font-face {
 	font-family: 'Font Awesome 5 Free';

assets/src/css/icons/fa/solid.scss

@@ -2,7 +2,7 @@
  * Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-@import 'assets/src/css/icons/fa/variables';
+@import './variables';
 
 @font-face {
 	font-family: 'Font Awesome 5 Free';

assets/src/css/icons/fa/v4-shims.scss

@@ -2,5 +2,5 @@
  * Font Awesome Free 5.12.1 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-@import 'assets/src/css/icons/fa/variables';
-@import 'assets/src/css/icons/fa/shims';
+@import './variables';
+@import './shims';

composer.json

@@ -17,7 +17,9 @@
         "symfony/polyfill-ctype": "^1.19",
         "symfony/polyfill-mbstring": "^1.19",
         "woocommerce/action-scheduler": "^3.6",
-        "ext-json": "*"
+        "psr/container": "1.1.1",
+        "ext-json": "*",
+        "stellarwp/admin-notices": "^2.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9",
@@ -94,6 +96,7 @@
             "classmap_prefix": "Give_Vendors_",
             "constant_prefix": "GIVE_VENDORS_",
             "packages": [
+                "stellarwp/admin-notices",
                 "stellarwp/validation",
                 "stellarwp/field-conditions",
                 "symfony/polyfill-ctype",
@@ -102,7 +105,8 @@
             ],
             "exclude_from_copy": {
                 "packages": [
-                    "symfony/deprecation-contracts"
+                    "symfony/deprecation-contracts",
+                    "psr/container"
                 ],
                 "file_patterns": [
                     "/Tests/"

give.php

@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 3.19.4
+ * Version: 3.21.1
  * Requires at least: 6.5
  * Requires PHP: 7.2
  * Text Domain: give
@@ -90,6 +90,7 @@
 use Give\Subscriptions\ServiceProvider as SubscriptionServiceProvider;
 use Give\TestData\ServiceProvider as TestDataServiceProvider;
 use Give\Tracking\TrackingServiceProvider;
+use Give\VendorOverrides\AdminNotices\AdminNoticesServiceProvider;
 use Give\VendorOverrides\FieldConditions\FieldConditionsServiceProvider;
 use Give\VendorOverrides\Validation\ValidationServiceProvider;
 
@@ -229,6 +230,7 @@ final class Give
         GlobalStylesServiceProvider::class,
         ValidationServiceProvider::class,
         ValidationRulesServiceProvider::class,
+        AdminNoticesServiceProvider::class,
         HttpServiceProvider::class,
         DesignSystemServiceProvider::class,
         FieldConditionsServiceProvider::class,
@@ -244,6 +246,7 @@ final class Give
         Give\DonationSpam\ServiceProvider::class,
         Give\Settings\ServiceProvider::class,
         Give\FeatureFlags\OptionBasedFormEditor\ServiceProvider::class,
+        Give\ThirdPartySupport\ServiceProvider::class,
     ];
 
     /**
@@ -301,6 +304,9 @@ public function init()
          *
          */
         do_action('give_init', $this);
+
+        // Activate any bundled licenses if not already activated.
+        add_action('admin_init', 'Give_License::activate_bundled_licenses');
     }
 
     /**
@@ -411,7 +417,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.19.4');
+            define('GIVE_VERSION', '3.21.1');
         }
 
         // Plugin Root File.