Skip to content

Commit

Permalink
Merge branch 'version-bump'
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrufus committed Feb 18, 2017
2 parents 79b1f87 + af607f7 commit 8e786b1
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github_changelog_generator
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
unreleased=true
future-release=0.1.1
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Change Log

## [0.1.1](https://github.com/TypistTech/wp-better-settings/tree/0.1.1) (2017-02-18)
[Full Changelog](https://github.com/TypistTech/wp-better-settings/compare/0.1.0...0.1.1)

**Merged pull requests:**

- Update grunt task configuration [\#12](https://github.com/TypistTech/wp-better-settings/pull/12) ([TangRufus](https://github.com/TangRufus))
- Fix scrutinizer warnings [\#11](https://github.com/TypistTech/wp-better-settings/pull/11) ([TangRufus](https://github.com/TangRufus))
- Add scrutinizer config [\#10](https://github.com/TypistTech/wp-better-settings/pull/10) ([TangRufus](https://github.com/TangRufus))
- Upgrade travis-nginx-wordpress to 0.1.1 [\#9](https://github.com/TypistTech/wp-better-settings/pull/9) ([TangRufus](https://github.com/TangRufus))
- TravisCI: Find SauceLabs job id by Travis build number [\#8](https://github.com/TypistTech/wp-better-settings/pull/8) ([TangRufus](https://github.com/TangRufus))
- Update travis-nginx-wordpress to 0.1.0 [\#6](https://github.com/TypistTech/wp-better-settings/pull/6) ([TangRufus](https://github.com/TangRufus))
- SauceLabs: Use Firefox version 50.0 [\#5](https://github.com/TypistTech/wp-better-settings/pull/5) ([TangRufus](https://github.com/TangRufus))
- TravisCI: Report test result to SauceLabs [\#3](https://github.com/TypistTech/wp-better-settings/pull/3) ([TangRufus](https://github.com/TangRufus))
- TravisCI: Disable xdebug if unnecessary [\#2](https://github.com/TypistTech/wp-better-settings/pull/2) ([TangRufus](https://github.com/TangRufus))
- Add code climate settings [\#1](https://github.com/TypistTech/wp-better-settings/pull/1) ([TangRufus](https://github.com/TangRufus))

## [0.1.0](https://github.com/TypistTech/wp-better-settings/tree/0.1.0) (2017-02-14)


\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
11 changes: 10 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ module.exports = function(grunt) {
},
src: ['composer.json']
},
changelog: {
options: {
prefix: 'future-release='
},
src: ['.github_changelog_generator']
},
php: {
options: {
prefix: '\\* Version:\\s+'
Expand All @@ -37,6 +43,9 @@ module.exports = function(grunt) {
exec: {
build: {
command: 'composer install --prefer-dist --no-dev --no-interaction --no-suggest --optimize-autoloader'
},
pretag: {
command: 'github_changelog_generator'
}
},

Expand Down Expand Up @@ -102,7 +111,7 @@ module.exports = function(grunt) {
});

require('load-grunt-tasks')(grunt);
grunt.registerTask('pre-tag', ['version']);
grunt.registerTask('pretag', ['version', 'exec:pretag']);
grunt.registerTask('build', ['clean:build', 'exec:build', 'copy:build', 'compress:build']);

grunt.util.linefeed = '\n';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "typisttech/wp-better-settings",
"description": "A simplified OOP implementation of the WP Settings API",
"version": "1.0.0",
"version": "0.1.1",
"keywords": [
"wordpress",
"wp",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wp-better-settings",
"version": "1.0.0",
"version": "0.1.1",
"description": "A simplified OOP implementation of the WP Settings API",
"keywords": [
"wordpress",
Expand Down
2 changes: 1 addition & 1 deletion wp-better-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Plugin Name: WP Better Settings
* Plugin URI: https://github.com/TypistTech/wp-better-settings
* Description: Example Plugin for WP Better Settings
* Version: 1.0.0
* Version: 0.1.1
* Author: Tang Rufus
* Author URI: https://www.typist.tech/
* Text Domain: wp-better-settings
Expand Down

0 comments on commit 8e786b1

Please sign in to comment.