Merge branch 'master' into update/readme

.github/workflows/code-quality.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup proper PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
 
       - name: Install Composer dependencies
         run: composer install --no-interaction --no-progress --no-suggest --optimize-autoloader
@@ -34,10 +34,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1 ]
+        php: [ 8.0, 8.1, 8.2, 8.3, 8.4 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.ref }}
 

.gitignore

@@ -40,6 +40,7 @@ npm-debug.log
 .sass-cache*
 .husky
 *.lock
+!composer.lock
 
 # Tests
 codeception.yml

bin/build-zip.sh

@@ -12,9 +12,9 @@ fi
 echo "➤ Preparing zip for $VERSION of $SLUG..."
 
 echo "➤ Building plugin..."
-npm install && npm run build
 composer install
 composer update --no-dev --no-scripts
+npm install && npm run build
 echo "✓ Plugin built!"
 
 # if directory already exists, delete it

bin/release.sh

@@ -16,12 +16,6 @@ fi
 
 echo "Preparing release $VERSION for $SLUG..."
 
-echo "➤ Building plugin..."
-npm install && npm run build
-composer install
-composer update --no-dev --no-scripts
-echo "✓ Plugin built!"
-
 # Check if svn user name is provided with -u flag and password with -p flag
 while getopts u:p: flag; do
 	case "${flag}" in
@@ -36,6 +30,17 @@ if [ -z "$SVN_USER" ] || [ -z "$SVN_PASSWORD" ]; then
 	exit 1
 fi
 
+# Replace the version in readme.txt
+sed -i '' "s/Stable tag: .*/Stable tag: $VERSION/" readme.txt
+# Replace the version in plugin file
+sed -i '' "s/Version: .*/Version: $VERSION/" $SLUG.php
+
+echo "➤ Building plugin..."
+npm install && npm run build
+composer install
+composer update --no-dev --no-scripts
+echo "✓ Plugin built!"
+
 # if directory already exists, delete it
 if [ -d "$SVN_DIR" ]; then
 	rm -rf $SVN_DIR
@@ -63,9 +68,9 @@ find "$SVN_DIR/trunk/" -type d -empty -delete
 
 # Copy assets
 # If .wordpress-org is a directory and contains files, copy them to the SVN repo.
-if [[ -d "$WORKSPACE/.wordpress-org" ]]; then
+if [[ -d "$WORKING_DIR/.wordpress-org" ]]; then
 	echo "➤ Copying assets..."
-	rsync -rc "$WORKSPACE/.wordpress-org/" "$SVN_DIR/assets/" --delete --delete-excluded
+	rsync -rc "$WORKING_DIR/.wordpress-org/" "$SVN_DIR/assets/" --delete --delete-excluded
 	# Fix screenshots getting force downloaded when clicking them
 	# https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/
 	if test -d "$SVN_DIR/assets" && test -n "$(find "$SVN_DIR/assets" -maxdepth 1 -name "*.png" -print -quit)"; then

composer.json

@@ -7,10 +7,6 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "repositories": [
-    {
-      "url": "[email protected]:byteever/byteever-sniffs.git",
-      "type": "github"
-    },
     {
       "url": "[email protected]:pluginever/framework-plugin.git",
       "type": "github"
@@ -28,7 +24,7 @@
     "php": ">=7.0"
   },
   "require-dev": {
-    "byteever/byteever-sniffs": "dev-master",
+    "byteever/byteever-sniffs": "^1.0",
     "codeception/lib-innerbrowser": "^1.0",
     "codeception/module-asserts": "^1.1",
     "codeception/module-cli": "^1.0",
@@ -42,9 +38,9 @@
     "level-level/wp-browser-woocommerce": "^0.1.8",
     "lucatume/wp-browser": "^3.1",
     "phpcompatibility/php-compatibility": "9.3.5",
+    "pluginever/framework-model": "dev-master",
     "pluginever/framework-plugin": "dev-master",
-    "pluginever/framework-settings": "dev-master",
-    "pluginever/framework-model": "dev-master"
+    "pluginever/framework-settings": "dev-master"
   },
   "config": {
     "optimize-autoloader": true,