Skip to content

Commit

Permalink
Merge branch 'release/v.3.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
schnatterer committed Mar 25, 2017
2 parents 74a307a + 13201a6 commit 9cd498e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
nusic Changelog
=========

**v.3.2.0** - 2017/03/25

* Added Share button to Release view

**v.3.1.0** - 2016/07/08

* Added Japanese translation (thanks, naofum!)
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ For passing the credentials for this keystore via the command line there are fou
2. Pass them as command line properties, e.g.
```sh
gradle clean check assembleRelease -PsignAlias="the key's alias within the keystore"
gradlew clean check assembleRelease -PsignAlias="the key's alias within the keystore"
```
3. Pass them as environment variables, e.g.
Expand All @@ -97,7 +97,7 @@ For passing the credentials for this keystore via the command line there are fou
4. or pass them as system property, e.g.
```sh
gradle clean check assembleRelease -Dorg.gradle.project.signKeystore=signAlias="the key's alias within the keystore"
gradlew clean check assembleRelease -Dorg.gradle.project.signKeystore=signAlias="the key's alias within the keystore"
```
Expand All @@ -112,14 +112,14 @@ TODO Automate this, e.g. via Jenkins
- Set Version
```sh
gradle setVersion -PnewVersion=2.1.1
gradlew setVersion -PnewVersion=2.1.1
```
- Update [changelog](CHANGELOG.md)
- Commit
```sh
git add .
git commit -m 'Prepare release v.2.1.1'
git commit -m "Prepare release v.2.1.1"
```
- Finish release & Tag (+ tag message)
Expand All @@ -129,15 +129,15 @@ TODO Automate this, e.g. via Jenkins
- Set next dev version & commit
```sh
gradle setVersion -PnewVersion=2.1.2-SNAPSHOT
gradlew setVersion -PnewVersion=2.1.2-SNAPSHOT
git add .
git commit -m "Prepare for next development iteration v.2.1.2-SNAPSHOT"
```
- Checkout and build tag
```sh
git checkout tags/v.2.1.1
gradle clean check assembleRelease
gradlew clean check assembleRelease
```
- Push all branches & tags
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Sat Mar 25 16:46:38 CET 2017
#Sat Mar 25 17:11:35 CET 2017
version=3.2.0
versionCode=20

0 comments on commit 9cd498e

Please sign in to comment.