Merge branch 'master' into dev
This commit is contained in:
commit
839be6c40c
2 changed files with 4 additions and 4 deletions
|
@ -99,7 +99,7 @@ android {
|
||||||
applicationId "info.nightscout.androidaps"
|
applicationId "info.nightscout.androidaps"
|
||||||
dimension "standard"
|
dimension "standard"
|
||||||
resValue "string", "app_name", "AndroidAPS"
|
resValue "string", "app_name", "AndroidAPS"
|
||||||
versionName version + "-pumpcontrol"
|
versionName version
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
appIcon: "@mipmap/ic_launcher",
|
appIcon: "@mipmap/ic_launcher",
|
||||||
appIconRound: "@mipmap/ic_launcher_round"
|
appIconRound: "@mipmap/ic_launcher_round"
|
||||||
|
@ -109,7 +109,7 @@ android {
|
||||||
applicationId "info.nightscout.aapspumpcontrol"
|
applicationId "info.nightscout.aapspumpcontrol"
|
||||||
dimension "standard"
|
dimension "standard"
|
||||||
resValue "string", "app_name", "Pumpcontrol"
|
resValue "string", "app_name", "Pumpcontrol"
|
||||||
versionName version
|
versionName version + "-pumpcontrol"
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
appIcon: "@mipmap/ic_pumpcontrol",
|
appIcon: "@mipmap/ic_pumpcontrol",
|
||||||
appIconRound: "@null"
|
appIconRound: "@null"
|
||||||
|
|
|
@ -56,9 +56,9 @@ android {
|
||||||
versionName version
|
versionName version
|
||||||
}
|
}
|
||||||
pumpcontrol {
|
pumpcontrol {
|
||||||
applicationId "info.nightscout.androidaps"
|
applicationId "info.nightscout.aapspumpcontrol"
|
||||||
dimension "standard"
|
dimension "standard"
|
||||||
versionName version
|
versionName version + "-pumpcontrol"
|
||||||
}
|
}
|
||||||
nsclient {
|
nsclient {
|
||||||
applicationId "info.nightscout.nsclient"
|
applicationId "info.nightscout.nsclient"
|
||||||
|
|
Loading…
Reference in a new issue