From 9cdab2087b1a9c665c3ca3e1c27942dcbb5a0e91 Mon Sep 17 00:00:00 2001 From: Justin Sainton Date: Tue, 8 Feb 2022 09:01:47 -0800 Subject: [PATCH] Update WP_Async_Task dependency inclusion method. * Was using submodules, which were not included as part of the build step. Moving to composer --- .github/workflows/deploy-to-wp-org.yml | 3 + .gitmodules | 3 - README.md | 3 + composer.json | 5 +- composer.lock | 62 ++++++++++++++++++- gathercontent-importer.php | 6 +- .../classes/post-types/async-save-hook.php | 2 - includes/classes/sync/async-base.php | 2 - includes/functions/core.php | 2 + includes/vendor/wp-async-task | 1 - package.json | 2 +- readme.txt | 3 + 12 files changed, 78 insertions(+), 16 deletions(-) delete mode 160000 includes/vendor/wp-async-task diff --git a/.github/workflows/deploy-to-wp-org.yml b/.github/workflows/deploy-to-wp-org.yml index 74f11fc1..242d49c5 100644 --- a/.github/workflows/deploy-to-wp-org.yml +++ b/.github/workflows/deploy-to-wp-org.yml @@ -9,6 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: Build + run: | + composer install -o --no-dev --ignore-platform-reqs - name: WordPress Plugin Deploy uses: 10up/action-wordpress-plugin-deploy@stable env: diff --git a/.gitmodules b/.gitmodules index f80aaefb..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "includes/vendor/wp-async-task"] - path = includes/vendor/wp-async-task - url = git@github.com:techcrunch/wp-async-task.git diff --git a/README.md b/README.md index 33a83c2c..47baeb59 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,9 @@ Below the text box is a button that will allow you to simply save all of that in ## Changelog ## +### 3.2.1 ### +* Resolve build process dependency error. + ### 3.2.0 ### * Add ability to edit Alt Text on media * Update dependencies diff --git a/composer.json b/composer.json index 30785a85..ab1f9959 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "gathercontent/wp-importer", "description": "Imports items from GatherContent to your wordpress site", - "version": "3.2.0", + "version": "3.2.1", "type": "wordpress-plugin", "keywords": [], "homepage": "http://www.gathercontent.com", @@ -16,7 +16,8 @@ ], "minimum-stability": "dev", "require": { - "php": ">=7.0" + "php": ">=7.0", + "techcrunch/wp-async-task": "dev-master" }, "require-dev": { "antecedent/patchwork": "2.1.*", diff --git a/composer.lock b/composer.lock index 6fd172cf..6be4708f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,65 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9305a8f3b1fa2fd75f7892f2138a00d9", - "packages": [], + "content-hash": "9ce40f3ed32e121069e8a353ddd9811a", + "packages": [ + { + "name": "techcrunch/wp-async-task", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/techcrunch/wp-async-task.git", + "reference": "9bdbbf9df4ff5179711bb58b9a2451296f6753dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/techcrunch/wp-async-task/zipball/9bdbbf9df4ff5179711bb58b9a2451296f6753dc", + "reference": "9bdbbf9df4ff5179711bb58b9a2451296f6753dc", + "shasum": "" + }, + "require-dev": { + "10up/wp_mock": "dev-master", + "phpunit/phpunit": "*@stable" + }, + "default-branch": true, + "type": "wordpress-plugin", + "autoload": { + "classmap": [ + "wp-async-task.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Khadiwala", + "role": "developer" + }, + { + "name": "Nicolas Vincent", + "role": "developer" + }, + { + "name": "Eric Mann", + "email": "eric.mann@10up.com", + "role": "developer" + }, + { + "name": "John P. Bloch", + "email": "john.bloch@10up.com", + "role": "developer" + } + ], + "description": "Run asynchronous tasks for long-running operations in WordPress", + "support": { + "issues": "https://github.com/techcrunch/wp-async-task/issues", + "source": "https://github.com/techcrunch/wp-async-task/tree/master" + }, + "time": "2016-03-10T17:37:13+00:00" + } + ], "packages-dev": [ { "name": "10up/wp_mock", @@ -3536,6 +3593,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "techcrunch/wp-async-task": 20, "brianium/paratest": 20 }, "prefer-stable": false, diff --git a/gathercontent-importer.php b/gathercontent-importer.php index d4377a1c..87ea77dc 100644 --- a/gathercontent-importer.php +++ b/gathercontent-importer.php @@ -3,7 +3,7 @@ * Plugin Name: GatherContent Plugin * Plugin URI: http://www.gathercontent.com * Description: Imports items from GatherContent to your wordpress site - * Version: 3.2.0 + * Version: 3.2.1 * Author: GatherContent * Requires PHP: 7.0 * Author URI: http://www.gathercontent.com @@ -31,8 +31,8 @@ */ // Useful global constants -define( 'GATHERCONTENT_VERSION', '3.2' ); -define( 'GATHERCONTENT_ENQUEUE_VERSION', '3.2' ); +define( 'GATHERCONTENT_VERSION', '3.2.1' ); +define( 'GATHERCONTENT_ENQUEUE_VERSION', '3.2.1' ); define( 'GATHERCONTENT_SLUG', 'gathercontent-import' ); define( 'GATHERCONTENT_PLUGIN', __FILE__ ); define( 'GATHERCONTENT_URL', plugin_dir_url( __FILE__ ) ); diff --git a/includes/classes/post-types/async-save-hook.php b/includes/classes/post-types/async-save-hook.php index 8ecbc2ef..27b7e999 100644 --- a/includes/classes/post-types/async-save-hook.php +++ b/includes/classes/post-types/async-save-hook.php @@ -1,8 +1,6 @@