Skip to content

Commit

Permalink
Set release date for 1.2.2 and generate bundles.
Browse files Browse the repository at this point in the history
Also fix "doc" recipe for Makefile.
  • Loading branch information
jcbrand committed Jun 20, 2015
1 parent fa0a59f commit 39402e7
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 38 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Strophe.js Change Log

## Version 1.2.2 - Unreleased
## Version 1.2.2 - 2015-06-20
* #109 Explicitly define AMD modules to prevent errors with AlmondJS and AngularJS.
* #111 Fixed IE9 compatibility.
* #113 Permit connecting with an alternative authcid.
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ PHANTOMJS ?= ./node_modules/.bin/phantomjs
SRC_DIR = src
DOC_DIR = doc
DOC_TEMP = doc-temp
PLUGIN_DIR = plugins
NDPROJ_DIR = ndproj

STROPHE = strophe.js
Expand Down Expand Up @@ -38,7 +37,7 @@ doc:
@@if [ ! -d $(DOC_DIR) ]; then mkdir $(DOC_DIR); fi
@@if [ ! -d $(DOC_TEMP) ]; then mkdir $(DOC_TEMP); fi
@@cp $(STROPHE) $(DOC_TEMP)
@@naturaldocs -r -ro -q -i $(DOC_TEMP) -i $(PLUGIN_DIR) -o html $(DOC_DIR) -p $(NDPROJ_DIR)
@@naturaldocs -r -ro -q -i $(DOC_TEMP) -o html $(DOC_DIR) -p $(NDPROJ_DIR)
@@echo "Documentation built."
@@echo

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "strophe.js",
"description": "Strophe.js is an XMPP library for JavaScript",
"version": "1.2.1",
"version": "1.2.2",
"license": "MIT",
"main": "strophe.js",
"authors": [
Expand Down
4 changes: 2 additions & 2 deletions release_checklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*** Make sure all tests pass (run 'make check' or 'Grunt qunit')
*** Decide on version number
*** Update CHANGELOG.txt
*** Check for correct version number in package.json
*** Run grunt release
*** Check for correct version number in package.json and bower,json
*** Run "make release"
*** Tag code with version (git tag -s vVERSION )
*** Push repo and tags (git push && git push --tags)
*** Add documentation to strophe.im repo
Expand Down
Loading

0 comments on commit 39402e7

Please sign in to comment.