diff --git a/.travis.yml b/.travis.yml index ef786d1..fda4cab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ notifications: # whitelist branches for the "push" build check branches: only: + - dev - main - /^dev\-release\/.*$/ - /^feature\/.*$/ diff --git a/Gruntfile.js b/Gruntfile.js index 0744ebc..c0b6b15 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -184,6 +184,28 @@ module.exports = function (grunt) { }, }, + // Bump version numbers + version: { + class: { + options: { + prefix: "const VERSION = '" + }, + src: ['<%= pkg.name %>.php'] + }, + header: { + options: { + prefix: '\\* Version:\\s+' + }, + src: ['<%= pkg.name %>.php'] + }, + readme: { + options: { + prefix: 'Stable tag:\\s+' + }, + src: ['readme.txt'] + } + } + }); grunt.registerTask('phpcs', ['shell:phpcs']); diff --git a/openid-connect-generic.php b/openid-connect-generic.php index 155da72..7045e13 100644 --- a/openid-connect-generic.php +++ b/openid-connect-generic.php @@ -16,7 +16,7 @@ * Plugin Name: OpenID Connect Generic * Plugin URI: https://github.com/daggerhart/openid-connect-generic * Description: Connect to an OpenID Connect generic client using Authorization Code Flow. - * Version: 3.7.1 + * Version: 3.8.0 * Author: daggerhart * Author URI: http://www.daggerhart.com * Text Domain: daggerhart-openid-connect-generic @@ -80,7 +80,7 @@ class OpenID_Connect_Generic { * * @var */ - const VERSION = '3.7.1'; + const VERSION = '3.8.0'; /** * Plugin settings. diff --git a/package-lock.json b/package-lock.json index 782a5d4..899d080 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openid-connect-generic", - "version": "3.7.1", + "version": "3.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -8367,6 +8367,16 @@ } } }, + "grunt-version": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-version/-/grunt-version-2.0.0.tgz", + "integrity": "sha512-Vf1Bey3HPc4hU/kB4zWhznqsHdMlawuZml+94mFiAta/LWWoQisBEoxXB8IeDV9pVUGJ3lOLZQlw5AZAp3pMGg==", + "dev": true, + "requires": { + "grunt": "^1.1.0", + "semver": "^6.3.0" + } + }, "grunt-wp-i18n": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/grunt-wp-i18n/-/grunt-wp-i18n-1.0.3.tgz", diff --git a/package.json b/package.json index 8db823f..445470e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openid-connect-generic", - "version": "3.7.1", + "version": "3.8.0", "description": "OpenID Connect generic WordPress plugin.", "main": "Gruntfile.js", "repository": { @@ -38,6 +38,7 @@ "grunt-contrib-copy": "^1.0.0", "grunt-gitinfo": "^0.1.9", "grunt-shell": "^2.1.0", + "grunt-version": "2.0.0", "grunt-wp-i18n": "^1.0.3", "grunt-wp-readme-to-markdown": "^2.0.0", "load-grunt-tasks": "^3.5", @@ -60,8 +61,10 @@ "grunt": "node_modules/.bin/grunt", "test": "npm run grunt test", "build": "npm run grunt build", - "check-engines": "wp-scripts check-engines", - "check-licenses": "wp-scripts check-licenses", + "version": "npm run grunt version", + "version:bump": "npm version --no-git-tag-version", + "check:engines": "wp-scripts check-engines", + "check:licenses": "wp-scripts check-licenses", "wp-env": "wp-env", "wp": "wp-env run cli wp", "i18n:check": "npm run grunt checktextdomain", diff --git a/readme.txt b/readme.txt index fb27901..39da427 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: http://www.daggerhart.com/ Tags: security, login, oauth2, openidconnect, apps, authentication, autologin, sso Requires at least: 4.9 Tested up to: 5.4.2 -Stable tag: trunk +Stable tag: 3.8.0 Requires PHP: 5.6 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -54,12 +54,9 @@ On the settings page for this plugin (Dashboard > Settings > OpenID Connect Gene = 3.8.0 = * Feature: @timnolte - Ability to use 6 new constants for setting client configuration instead of storing in the DB. -* Improvement: @timnolte - NPM version requirements for development. -* Improvement: @timnolte - Travis CI build fixes. -* Improvement: @timnolte - GrumPHP configuration updates for code contributions. +* Improvement: @timnolte - Plugin development & contribution updates. * Improvement: @timnolte - Refactored to meet WordPress coding standards. * Improvement: @timnolte - Refactored to provide localization. -* Improvement: @timnolte - Refactored to provide a Docker-based local development environment. = 3.7.1 =