From b993902626eb1b585e938b9f0a890d90030499a6 Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 16:54:28 +0100 Subject: [PATCH 1/6] Prepare for next development iteration v.3.2.1 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 03a21a1..36957d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -#Sat Mar 25 16:46:38 CET 2017 -version=3.2.0 -versionCode=20 +#Sat Mar 25 16:53:45 CET 2017 +version=v.3.2.1-SNAPSHOT +versionCode=21 From a36ba2a9413c43d1fd249db6f22b17ac7cdd7ede Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 16:56:14 +0100 Subject: [PATCH 2/6] Readme: Favor gradlew over gradle command. Consistently. --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5ef5aaf..1caa5cb 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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" ``` @@ -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) @@ -129,7 +129,7 @@ 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" ``` @@ -137,7 +137,7 @@ TODO Automate this, e.g. via Jenkins ```sh git checkout tags/v.2.1.1 - gradle clean check assembleRelease + gradlew clean check assembleRelease ``` - Push all branches & tags From a33f8c8bf936df9fd94b8dda98a8b686a8782ddd Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 17:08:56 +0100 Subject: [PATCH 3/6] Revert "Prepare for next development iteration v.3.2.1" This reverts commit b993902626eb1b585e938b9f0a890d90030499a6. --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 36957d4..03a21a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -#Sat Mar 25 16:53:45 CET 2017 -version=v.3.2.1-SNAPSHOT -versionCode=21 +#Sat Mar 25 16:46:38 CET 2017 +version=3.2.0 +versionCode=20 From 10f261294b041b5c8ada86d058bea81965eba113 Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 17:09:41 +0100 Subject: [PATCH 4/6] Revert "Prepare release v.3.2.0" This reverts commit 10ff0f35ff6cd519251134526fc27813861fb485. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 03a21a1..351e123 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -#Sat Mar 25 16:46:38 CET 2017 -version=3.2.0 +#Fri Jul 08 16:53:02 CEST 2016 +version=3.1.1-SNAPSHOT versionCode=20 From d43b14ff088467bc60705bbfe2350f0548568416 Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 17:10:49 +0100 Subject: [PATCH 5/6] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6557c5..0907004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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!) From 13201a6465431269398c546a4ccf179432ecdefd Mon Sep 17 00:00:00 2001 From: schnatterer Date: Sat, 25 Mar 2017 17:11:48 +0100 Subject: [PATCH 6/6] Prepare release v.3.2.0 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 351e123..e9d5ecc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -#Fri Jul 08 16:53:02 CEST 2016 -version=3.1.1-SNAPSHOT +#Sat Mar 25 17:11:35 CET 2017 +version=3.2.0 versionCode=20