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

@@ -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:

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "includes/vendor/wp-async-task"]
-	path = includes/vendor/wp-async-task
-	url = [email protected]:techcrunch/wp-async-task.git

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

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.*",

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__ ) );

includes/classes/post-types/async-save-hook.php

@@ -1,8 +1,6 @@
 <?php
 namespace GatherContent\Importer\Post_Types;
 
-require_once GATHERCONTENT_INC . 'vendor/wp-async-task/wp-async-task.php';
-
 class Async_Save_Hook extends \WP_Async_Task {
 	protected $action    = 'save_post';
 	protected $post_type = 'save_post';

includes/classes/sync/async-base.php

@@ -4,8 +4,6 @@
 use GatherContent\Importer\General;
 use GatherContent\Importer\Debug;
 
-require_once GATHERCONTENT_INC . 'vendor/wp-async-task/wp-async-task.php';
-
 abstract class Async_Base extends \WP_Async_Task {
 
 	/**

includes/functions/core.php

@@ -64,6 +64,8 @@ function setup() {
 
 	spl_autoload_register( $n( 'autoload' ), false );
 
+	include_once GATHERCONTENT_PATH . 'vendor/autoload.php';
+
 	if ( is_admin() ) {
 		// We only need to do our work in the admin.
 		add_action( 'init', $n( 'init' ) );

package.json

@@ -2,7 +2,7 @@
   "name": "gathercontent-importer",
   "title": "GatherContent Plugin",
   "description": "Imports items from GatherContent to your wordpress site",
-  "version": "3.1.13",
+  "version": "3.2.1",
   "license": "GPLv2",
   "homepage": "http://www.gathercontent.com",
   "repository": {

readme.txt

@@ -65,6 +65,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