diff --git a/composer.json b/composer.json index 48a0490eea3..d5c5e4a044d 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ "automattic/jetpack-autoloader": "^1.2.0", "composer/installers": "1.7.0", "maxmind-db/reader": "1.6.0", - "woocommerce/woocommerce-blocks": "2.5.7", - "woocommerce/woocommerce-rest-api": "1.0.5" + "woocommerce/woocommerce-blocks": "2.5.10", + "woocommerce/woocommerce-rest-api": "1.0.6" }, "require-dev": { "phpunit/phpunit": "7.5.18", diff --git a/composer.lock b/composer.lock index 58b730a3f76..16ee08e844d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "16f33bdc0f7129c5ec814efd76744356", + "content-hash": "e8edf85437f4ee3362f0447d20314506", "packages": [ { "name": "automattic/jetpack-autoloader", @@ -226,16 +226,16 @@ }, { "name": "woocommerce/woocommerce-blocks", - "version": "v2.5.7", + "version": "v2.5.10", "source": { "type": "git", "url": "https://github.com/woocommerce/woocommerce-gutenberg-products-block.git", - "reference": "24b6552d38204fbbdd87ec5ba76f3ec391b042d0" + "reference": "4a6d993c1df7ccd8581873ee56269efa00d49ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/24b6552d38204fbbdd87ec5ba76f3ec391b042d0", - "reference": "24b6552d38204fbbdd87ec5ba76f3ec391b042d0", + "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/4a6d993c1df7ccd8581873ee56269efa00d49ddc", + "reference": "4a6d993c1df7ccd8581873ee56269efa00d49ddc", "shasum": "" }, "require": { @@ -269,20 +269,20 @@ "gutenberg", "woocommerce" ], - "time": "2019-12-20T17:36:46+00:00" + "time": "2020-01-09T15:29:03+00:00" }, { "name": "woocommerce/woocommerce-rest-api", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/woocommerce/woocommerce-rest-api.git", - "reference": "3be425631faefa61ab8b81011ae8a422b9bfca35" + "reference": "78ccf4d4c6bafbc841182b68aa863e7b0caa37c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/woocommerce/woocommerce-rest-api/zipball/3be425631faefa61ab8b81011ae8a422b9bfca35", - "reference": "3be425631faefa61ab8b81011ae8a422b9bfca35", + "url": "https://api.github.com/repos/woocommerce/woocommerce-rest-api/zipball/78ccf4d4c6bafbc841182b68aa863e7b0caa37c8", + "reference": "78ccf4d4c6bafbc841182b68aa863e7b0caa37c8", "shasum": "" }, "require": { @@ -309,7 +309,7 @@ ], "description": "The WooCommerce core REST API.", "homepage": "https://github.com/woocommerce/woocommerce-rest-api", - "time": "2019-12-18T22:20:59+00:00" + "time": "2020-01-15T23:29:39+00:00" } ], "packages-dev": [ @@ -587,16 +587,16 @@ }, { "name": "phpcompatibility/php-compatibility", - "version": "9.3.4", + "version": "9.3.5", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", - "reference": "1f37659196e4f3113ea506a7efba201c52303bf1" + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/1f37659196e4f3113ea506a7efba201c52303bf1", - "reference": "1f37659196e4f3113ea506a7efba201c52303bf1", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243", "shasum": "" }, "require": { @@ -641,7 +641,7 @@ "phpcs", "standards" ], - "time": "2019-11-15T04:12:02+00:00" + "time": "2019-12-27T09:44:58+00:00" }, { "name": "phpcompatibility/phpcompatibility-paragonie", @@ -799,16 +799,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.2", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e" + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", - "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", + "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", "shasum": "" }, "require": { @@ -820,6 +820,7 @@ "require-dev": { "doctrine/instantiator": "^1.0.5", "mockery/mockery": "^1.0", + "phpdocumentor/type-resolver": "0.4.*", "phpunit/phpunit": "^6.4" }, "type": "library", @@ -846,7 +847,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-09-12T14:27:41+00:00" + "time": "2019-12-28T18:55:12+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -897,16 +898,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d638ebbb58daba25a6a0dc7969e1358a0e3c6682" + "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d638ebbb58daba25a6a0dc7969e1358a0e3c6682", - "reference": "d638ebbb58daba25a6a0dc7969e1358a0e3c6682", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/cbe1df668b3fe136bcc909126a0f529a78d4cbbc", + "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc", "shasum": "" }, "require": { @@ -956,7 +957,7 @@ "spy", "stub" ], - "time": "2019-12-17T16:54:23+00:00" + "time": "2019-12-22T21:05:45+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/readme.txt b/readme.txt index 94a074c3613..bd0350e4727 100644 --- a/readme.txt +++ b/readme.txt @@ -201,6 +201,7 @@ INTERESTED IN DEVELOPMENT? * Tweak - Include processing orders in tracker data when opted in. #25071 * Tweak - Centralize check for default themes to fix Storefront appearance in the Setup Wizard. #25216 * Tweak - Adds a WordPress version check before recommending the WooCommerce Admin plugin during setup. #25260 +* Fix - Added license key support recent changes from MaxMind GeoLite2. #25378 * Fix - Honor tax rounding preference in edit item and refund flows. #24208 * Fix - Prevent incorrect number of decimal points in prices. #24281 * Fix - Fixed initial support for Gutenberg's Experimental Legacy Widget block. #24292 diff --git a/woocommerce.php b/woocommerce.php index 1e0e98c5d38..567a96036f1 100644 --- a/woocommerce.php +++ b/woocommerce.php @@ -3,7 +3,7 @@ * Plugin Name: WooCommerce * Plugin URI: https://woocommerce.com/ * Description: An eCommerce toolkit that helps you sell anything. Beautifully. - * Version: 3.9.0-rc.2 + * Version: 3.9.0-rc.3 * Author: Automattic * Author URI: https://woocommerce.com * Text Domain: woocommerce