Compare commits
8 Commits
v171811315
...
v171811317
Author | SHA1 | Date | |
---|---|---|---|
bdb71e9b14 | |||
df22e7de15 | |||
6b3550396b | |||
c70f1e31a6 | |||
695670e944 | |||
1028826788 | |||
82a8977c96 | |||
07d9ce1054 |
@ -166,6 +166,6 @@
|
||||
<string name="new_items_notification_text">%1$d artículos cargados.</string>
|
||||
<string name="pref_switch_notify_new_items">Notificarme cuando se sincronicen nuevos artículos.</string>
|
||||
<string name="shortcut_offline">Sin conexión</string>
|
||||
<string name="pref_api_timeout">Api Timeout</string>
|
||||
<string name="pref_api_timeout">Se acabó el tiempo de espera de la API</string>
|
||||
<string name="pref_header_experimental">Experimental</string>
|
||||
</resources>
|
||||
|
@ -166,6 +166,6 @@
|
||||
<string name="new_items_notification_text">%1$d novos elementos cargados.</string>
|
||||
<string name="pref_switch_notify_new_items">Notificarme cando se sincronicen novos elementos.</string>
|
||||
<string name="shortcut_offline">Sen conexión</string>
|
||||
<string name="pref_api_timeout">Api Timeout</string>
|
||||
<string name="pref_api_timeout">Acabouse o tempo de espera da API</string>
|
||||
<string name="pref_header_experimental">Experimental</string>
|
||||
</resources>
|
||||
|
22
build.sh
22
build.sh
@ -1,9 +1,23 @@
|
||||
#!/bin/bash
|
||||
|
||||
BASE_VERSION="1.7"
|
||||
TODAYS_VERSION="1"
|
||||
git fetch --tags -p
|
||||
|
||||
VERSION="${BASE_VERSION//./}$(date '+%y%m%j')$TODAYS_VERSION"
|
||||
BASE_VERSION="1.7"
|
||||
LAST_TAG=$(git tag -l | sort -V | tail -1)
|
||||
|
||||
INITIAL_VERSION="${BASE_VERSION//./}$(date '+%y%m%j')"
|
||||
|
||||
LAST_DAY_VERSION=$(echo $LAST_TAG | sed "s/v${INITIAL_VERSION}//")
|
||||
LAST_DAY_VERSION_LENGTH=$(echo "${#LAST_DAY_VERSION}")
|
||||
|
||||
if [[ "$LAST_DAY_VERSION_LENGTH" == "1" ]]
|
||||
then
|
||||
TODAYS_VERSION=$(( $LAST_DAY_VERSION + 1 ))
|
||||
else
|
||||
TODAYS_VERSION="1"
|
||||
fi
|
||||
|
||||
VERSION="${INITIAL_VERSION}${TODAYS_VERSION}"
|
||||
|
||||
PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//')
|
||||
|
||||
@ -13,5 +27,5 @@ if [[ "$@" == *'--publish'* ]]
|
||||
then
|
||||
./publish-version.sh ${VERSION}
|
||||
else
|
||||
echo "Did not publish. If you wanted to do so, call the script with \"--publish\"."
|
||||
echo "Did not publish. If you wanted to do so, call the script with \"--publish\" or \"--publish-local\"."
|
||||
fi
|
||||
|
@ -1,5 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# NOTE: This is copy/pasted in jenkins
|
||||
|
||||
rm -f version.txt
|
||||
printf "versionName=$1-github\nversionCode=$1" >> version.txt
|
||||
|
||||
|
Reference in New Issue
Block a user