WIP - Release/2.1.0 (#88)

Merge 2.1.0 to master.

Co-authored-by: Jon Christopher <[email protected]>
Co-authored-by: Pippin Williamson <[email protected]>
Co-authored-by: Phil Derksen <[email protected]>

.gitignore

@@ -42,6 +42,7 @@ tests/clover.xml
 
 # Node
 node_modules
+pnpm-lock.yaml
 
 # Vendor
 /vendor

.travis.yml

@@ -10,11 +10,10 @@ notifications:
 
 branches:
   only:
-    - master
+    - /^release\/.*$/
 
 cache:
   directories:
-    - vendor
     - $HOME/.composer/cache
 
 matrix:
@@ -45,7 +44,28 @@ before_script:
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
       bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-      composer global require "phpunit/phpunit=4.8.*|5.7.*"
+    fi
+  - |
+    # Install the specified version of PHPUnit depending on the PHP version:
+    if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+      case "$TRAVIS_PHP_VERSION" in
+        7.4|7.3|nightly)
+          echo "Using PHPUnit 7.x"
+          composer global require "phpunit/phpunit:^7"
+          ;;
+        7.2|7.1|7.0)
+          echo "Using PHPUnit 6.x"
+          composer global require "phpunit/phpunit:^6"
+          ;;
+        5.6|5.5|5.4)
+          echo "Using PHPUnit 4.x"
+          composer global require "phpunit/phpunit:^4"
+          ;;
+        *)
+          echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
+          exit 1
+          ;;
+      esac
     fi
 
 script:

Gruntfile.js

@@ -106,6 +106,13 @@ module.exports = function( grunt ) {
 						dest: '<%= pkg.name %>/includes/admin/assets/css/rtl',
 						ext: '.css',
 					},
+					{
+						expand: true,
+						cwd: '<%= pkg.name %>/includes/admin/assets/css/ltr',
+						src: [ 'sc-taxonomy.css' ],
+						dest: '<%= pkg.name %>/includes/admin/assets/css/rtl',
+						ext: '.css',
+					},
 				],
 			},
 		},
@@ -172,6 +179,13 @@ module.exports = function( grunt ) {
 						dest: '<%= pkg.name %>/includes/admin/assets/css/min/ltr',
 						ext: '.css',
 					},
+					{
+						expand: true,
+						cwd: '<%= pkg.name %>/includes/admin/assets/css/ltr',
+						src: [ 'sc-taxonomy.css' ],
+						dest: '<%= pkg.name %>/includes/admin/assets/css/min/ltr',
+						ext: '.css',
+					},
 				],
 			},
 			rtl: {
@@ -232,6 +246,13 @@ module.exports = function( grunt ) {
 						dest: '<%= pkg.name %>/includes/admin/assets/css/min/rtl',
 						ext: '.css',
 					},
+					{
+						expand: true,
+						cwd: '<%= pkg.name %>/includes/admin/assets/css/rtl',
+						src: [ 'sc-taxonomy.css' ],
+						dest: '<%= pkg.name %>/includes/admin/assets/css/min/rtl',
+						ext: '.css',
+					},
 				],
 			},
 		},

composer.json

@@ -0,0 +1,16 @@
+{
+    "name": "sugarcalendar/core",
+	"type": "wordpress-plugin",
+    "description": "Sugar Calendar Plugin for WordPress",
+    "keywords": ["wordpress", "sugarcalendar", "calendar", "events"],
+    "homepage": "https://sugarcalendar.com",
+	"license": "GPL-2.0+",
+    "require": {
+        "php": ">=7.0.0",
+        "composer/installers": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.8.* || 5.7.*"
+    },
+    "minimum-stability": "dev"
+}