Merge branch 'master' into dev

This commit is contained in:
Milos Kozak 2019-03-05 20:54:23 +01:00
commit 839be6c40c
2 changed files with 4 additions and 4 deletions

View file

@ -99,7 +99,7 @@ android {
applicationId "info.nightscout.androidaps"
dimension "standard"
resValue "string", "app_name", "AndroidAPS"
versionName version + "-pumpcontrol"
versionName version
manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher",
appIconRound: "@mipmap/ic_launcher_round"
@ -109,7 +109,7 @@ android {
applicationId "info.nightscout.aapspumpcontrol"
dimension "standard"
resValue "string", "app_name", "Pumpcontrol"
versionName version
versionName version + "-pumpcontrol"
manifestPlaceholders = [
appIcon: "@mipmap/ic_pumpcontrol",
appIconRound: "@null"

View file

@ -56,9 +56,9 @@ android {
versionName version
}
pumpcontrol {
applicationId "info.nightscout.androidaps"
applicationId "info.nightscout.aapspumpcontrol"
dimension "standard"
versionName version
versionName version + "-pumpcontrol"
}
nsclient {
applicationId "info.nightscout.nsclient"