Merge branch 'dev' into insightfix

2018-08-31 08:26:59 +02:00 · 2018-08-31 08:26:59 +02:00 · 7fd0d2fe56
commit 7fd0d2fe56
parent abc374193a 063ead4c17
14 changed files with 1185 additions and 19 deletions
--- a/app/src/main/java/com/squareup/otto/LoggingBus.java
+++ b/app/src/main/java/com/squareup/otto/LoggingBus.java
@ -13,11 +13,12 @@ import java.util.Set;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.logging.L;

-/** Logs events has they're being posted to and dispatched from the event bus.
- *
+/**
+ * Logs events has they're being posted to and dispatched from the event bus.
+ * <p>
 * A summary of event-receiver calls that occurred so far is logged
 * after 10s (after startup) and then again every 60s.
- * */
+ */
 public class LoggingBus extends Bus {
    private static Logger log = LoggerFactory.getLogger(L.EVENTS);

@ -49,7 +50,10 @@ public class LoggingBus extends Bus {
            log.debug("    source: <unknown>");
        }

+        try {
            super.post(event);
+        } catch (IllegalStateException ignored) {
+        }
    }

    @Override
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@ -137,7 +137,7 @@ public class MainApp extends Application {
        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile();
        devBranch = BuildConfig.VERSION.contains("dev");

-        sBus = L.isEnabled(L.EVENTS) ? new LoggingBus(ThreadEnforcer.ANY) : new Bus(ThreadEnforcer.ANY);
+        sBus = L.isEnabled(L.EVENTS) && devBranch ? new LoggingBus(ThreadEnforcer.ANY) : new Bus(ThreadEnforcer.ANY);

        registerLocalBroadcastReceiver();

--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
@ -240,12 +240,12 @@ public class DetermineBasalAdapterSMBJS {
        mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
        mProfile.put("maxCOB", SMBDefaults.maxCOB);
        mProfile.put("skip_neutral_temps", SMBDefaults.skip_neutral_temps);
-        //align with max-absorption model in AMA sensitivity
-        if (mealData.usedMinCarbsImpact > 0) {
-            mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
-        } else {
-            mProfile.put("min_5m_carbimpact", SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact));
-        }
+        // min_5m_carbimpact is not used within SMB determinebasal
+        //if (mealData.usedMinCarbsImpact > 0) {
+        //    mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
+        //} else {
+        //    mProfile.put("min_5m_carbimpact", SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact));
+        //}
        mProfile.put("remainingCarbsCap", SMBDefaults.remainingCarbsCap);
        mProfile.put("enableUAM", SP.getBoolean(R.string.key_use_uam, false));
        mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
@ -408,9 +408,24 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
            result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
            result.bolusDelivered = t.insulin;
            result.carbsDelivered = detailedBolusInfo.carbs;
-            if (!result.success)
-                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode);
-            else
+            if (!result.success) {
+                String error = "" + DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode;
+                switch (DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode) {
+                    case 0x10:
+                        error = MainApp.gs(R.string.maxbolusviolation);
+                        break;
+                    case 0x20:
+                        error = MainApp.gs(R.string.commanderror);
+                        break;
+                    case 0x40:
+                        error = MainApp.gs(R.string.speederror);
+                        break;
+                    case 0x80:
+                        error = MainApp.gs(R.string.insulinlimitviolation);
+                        break;
+                }
+                result.comment = String.format(MainApp.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error);
+            } else
                result.comment = MainApp.gs(R.string.virtualpump_resultok);
            if (L.isEnabled(L.PUMP))
                log.debug("deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
@ -67,6 +67,8 @@ public class SourceDexcomG5Plugin extends PluginBase implements BgSourceInterfac
        if (L.isEnabled(L.BGSOURCE))
            log.debug("Received Dexcom Data", data);

+        if (data == null) return;
+
        try {
            JSONArray jsonArray = new JSONArray(data);
            if (L.isEnabled(L.BGSOURCE))
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java
@ -33,7 +33,6 @@ public class WizardInfoDialog extends DialogFragment implements OnClickListener
                             Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.treatments_wizardinfo_dialog, null, false);

-        getDialog().getWindow().requestFeature(Window.FEATURE_CUSTOM_TITLE);
        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);

        view.findViewById(R.id.ok).setOnClickListener(this);
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="treatmentssafety_title">Behandeling veiligheid</string>
+  <string name="treatmentssafety_title">Behandelingen veiligheid</string>
  <string name="treatmentssafety_maxbolus_title">Max toegestane bolus [E]</string>
  <string name="treatmentssafety_maxcarbs_title">Max toegestane koolhydraten [g]</string>
  <string name="nav_preferences">Instellingen</string>
@ -949,6 +949,10 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
  <string name="openapsama_max_daily_safety_multiplier">Maximale dagelijkse veiligheids vermeningvuldigings factor</string>
  <string name="openapsama_current_basal_safety_multiplier">Actuele veiliheids verhoger van basaal</string>
  <string name="value_unavailable_short">n/a</string>
+  <string name="virtualpump_type">Virtuele pomp Type</string>
+  <string name="virtualpump_definition">Pomp definitie</string>
+  <string name="virtualpump_pump_def">Bolus: Stap=%1$s\nExtended Bolus: [Stap=%2$s, Duur=%3$smin-%4$sh]\nBasaal: Stap=%5$s\nTBR: %6$s (by %7$s), Duur=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Basaal- /boluswaarden worden niet ondersteund door virtuele pomp.</string>
  <string name="ns_autobackfill_title">Automatische BG aanvullen</string>
  <string name="wear_wizard_settings">Wizard instellingen</string>
  <string name="wear_wizard_settings_summary">Berekeningen inclusief in het resultaat van de wizard</string>
@ -1027,6 +1031,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
  <string name="send_all_logs">Verstuur Logs per e-mail</string>
  <string name="delete_logs">Verwijder Logs</string>
  <string name="error_adding_treatment_message">Een Behandeling (insuline: %1$.2f, koolhydraten: %2$d, in: %3$s) niet konden worden toegevoegd aan Behandelingen. Gelieve te controleren en handmatig een record toe te voegen indien nodig.</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), vertraging: %3$d m</string>
  <string name="openaps_noasdata">Geen autosens-gegevens beschikbaar</string>
  <string name="nav_logsettings">Log instellingen</string>
  <string name="resettodefaults">Terug naar standaardinstellingen</string>
@ -1034,6 +1039,11 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
  <string name="as">AS</string>
  <string name="versionavailable">Versie %1$s is beschikbaar</string>
  <string name="time_offset">Tijdverschuiving</string>
+  <string name="setupwizard_preferred_aps_mode">Voorkeur APS-modus</string>
+  <string name="treatments_wizard_total_label">Totaal</string>
+  <string name="calculation_short">Calc</string>
+  <string name="handshaking">Handshaking</string>
+  <string name="sendlogfiles">Logboekbestanden van vandaag verzenden aan ontwikkelaars samen met de onverwachte situatie.</string>
  <plurals name="objective_days">
    <item quantity="one">%1$d dag</item>
    <item quantity="other">%1$d dag</item>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -948,6 +948,10 @@
  <string name="openapsama_max_daily_safety_multiplier">Multiplicator sigur maxim zilnic</string>
  <string name="openapsama_current_basal_safety_multiplier">Multiplicator sigur pentru bazala curentă</string>
  <string name="value_unavailable_short">indisponibil</string>
+  <string name="virtualpump_type">Tipul pompei virtuale</string>
+  <string name="virtualpump_definition">Definirea pompei</string>
+  <string name="virtualpump_pump_def">Bolus: Pas=%1$s\nBolus Extins: [Pas=%2$s, Durată=%3$smin-%4$sh]\nBazală: Pas=%5$s\nRBT: %6$s (cu %7$s), Durată=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">Valorile bazalei/bolusului variate nu sunt suportate de căter Pompa Virtuală.</string>
  <string name="ns_autobackfill_title">Autocompletează glicemiile lipsă</string>
  <string name="wear_wizard_settings">Asistent setări</string>
  <string name="wear_wizard_settings_summary">Calcule incluse în rezultatul asistentului:</string>
@ -1034,6 +1038,11 @@
  <string name="as">AS</string>
  <string name="versionavailable">Versiunea %1$s este disponibilă</string>
  <string name="time_offset">Diferență de fus orar</string>
+  <string name="setupwizard_preferred_aps_mode">Modul APS preferat</string>
+  <string name="treatments_wizard_total_label">Total</string>
+  <string name="calculation_short">Calc</string>
+  <string name="handshaking">Împerechere</string>
+  <string name="sendlogfiles">Trimite înregistrările zilei de astăzi către dezvoltatori, împreună cu timpul curent. Situație neașteptată.</string>
  <plurals name="objective_days">
    <item quantity="one">%1$d zi</item>
    <item quantity="few">%1$d zi</item>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -948,6 +948,10 @@
  <string name="openapsama_max_daily_safety_multiplier">Множитель безопасности макс суточного базала</string>
  <string name="openapsama_current_basal_safety_multiplier">Текущий множитель безопасности базала</string>
  <string name="value_unavailable_short">н/д</string>
+  <string name="virtualpump_type">Тип виртуальной помпы</string>
+  <string name="virtualpump_definition">Определение помпы</string>
+  <string name="virtualpump_pump_def">Болюс: Шаг =%1$s\nПродленный Болюс: [Шаг =%2$s, Длительность =%3$sмин -%4$sh] \nБазал: Шаг =%5$s\ nTBR: %6$s (на %7$s), Длительность =%8$sмин -%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Величины в данных диапазонах не поддерживаются Виртуальной Помпой.</string>
  <string name="ns_autobackfill_title">Автозаполнение пропущенных данных СК</string>
  <string name="wear_wizard_settings">Параметры мастера настройки смарт-часов wear</string>
  <string name="wear_wizard_settings_summary">Расчеты, включены в результат мастера настройки смарт-часов wear:</string>
@ -1040,4 +1044,5 @@ Context | Edit Context</string>
  <string name="treatments_wizard_total_label">Итого</string>
  <string name="calculation_short">Кальк</string>
  <string name="handshaking">Подтверждение связи</string>
+  <string name="sendlogfiles">Отправьте файлы сегодняшнего лога разработчикам наряду с этим. Непредвиденная ситуация.</string>
 </resources>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -712,6 +712,8 @@
  <string name="dexcomg5_xdripupload_title">将血糖数据发送到 xDrip +</string>
  <string name="dexcomg5_xdripupload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
  <string name="nsclientbg">NSClient 血糖</string>
+  <string name="minimalbasalvaluereplaced">基础率值被泵支持的最小值: %s 替换了</string>
+  <string name="maximumbasalvaluereplaced">基础率值被泵支持的最大值:%s 替换了</string>
  <string name="overview_editquickwizard_usebg">血糖计算</string>
  <string name="overview_editquickwizard_usebolusiob">大剂量IOB (活性胰岛素) 计算</string>
  <string name="overview_editquickwizard_usebasaliob">基础率IOB (活性胰岛素) 计算</string>
@ -765,6 +767,7 @@
  <string name="combo_error_no_connection_no_bolus_delivered">找不到泵，大剂量输注失败</string>
  <string name="combo_error_no_bolus_delivered">大剂量输注失败，看起来好像没有大剂量被输注。安全起见，请检查泵，避免重复输注大剂量。软件考虑安全因素，不会再自动重试大剂量输注.</string>
  <string name="combo_error_partial_bolus_delivered">由于遇到一个错误， %2$.2f U 中只有%1$.2fU 输注成功了. 请在泵上检查并核实，看是否需要采取适当的措施.</string>
+  <string name="combo_error_bolus_verification_failed">正在输注大剂量和核实泵的历史失败了，请检查泵，如果大剂量已经输注成功，下次连接泵的时候会在治疗的标签里自动添加一个大剂量记录.</string>
  <string name="combo_reservoir_level_insufficient_for_bolus">储药器里没有足够的胰岛素可用于大剂量输注了</string>
  <string name="extendedbolusdeliveryerror">扩展大剂量(方波) 输注错误</string>
  <string name="insightpump_shortname">Insight</string>
@ -945,6 +948,10 @@
  <string name="openapsama_max_daily_safety_multiplier">最大日基础率安全倍数</string>
  <string name="openapsama_current_basal_safety_multiplier">当前基础率安全倍数</string>
  <string name="value_unavailable_short">无可用</string>
+  <string name="virtualpump_type">虚拟泵类型</string>
+  <string name="virtualpump_definition">泵定义</string>
+  <string name="virtualpump_pump_def">大剂量: Step=%1$s\n扩展大剂量: [Step=%2$s, 持续时间=%3$smin-%4$sh]\n基础率: Step=%5$s\nTBR临时基础率: %6$s (by %7$s), 持续时间=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* 虚拟泵不支持远程修改基础率或输注大剂量</string>
  <string name="ns_autobackfill_title">Autobackfill 血糖</string>
  <string name="wear_wizard_settings">向导设置</string>
  <string name="wear_wizard_settings_summary">包含在向导中的计算结果：</string>
@ -985,6 +992,7 @@
  <string name="danar_pumpalarm_vibrate">振动</string>
  <string name="danar_pumpalarm_both">两者都</string>
  <string name="danar_screentimeout">LCD屏幕亮的时间[s]</string>
+  <string name="danar_backlight">背景光开启的时间[s]</string>
  <string name="danar_glucoseunits">血糖单位</string>
  <string name="danar_shutdown">关机(小时)</string>
  <string name="danar_lowreservoir">储药器药量低(单位)</string>
@ -1012,10 +1020,29 @@
  <string name="storedsettingsfound">发现曾经保存过的设置</string>
  <string name="allow_hardware_pump_text">注意：如果你激活并且连接到了一个硬件泵，AndroidAPS将会从配置文件复制基础率到泵上。覆盖泵上已有的基础率。请确定你已经在AndroidAPS上设置了正确的基础率。如果你不确定或者不想覆盖泵上的基础率设置，按取消键，以后再切换激活配置文件。</string>
  <string name="error_adding_treatment_title">治疗数据不完整</string>
+  <string name="maintenance_settings">维护设置</string>
+  <string name="maintenance_email">电子邮箱</string>
+  <string name="invalid_email_message">邮箱地址无效</string>
+  <string name="maintenance_amount">没有要发送的日志</string>
+  <string name="maintenance">维护</string>
+  <string name="maintenance_shortname">维护</string>
+  <string name="description_maintenance">提供了几个维护功能 (例如日志发送、日志删除)。</string>
+  <string name="send_all_logs">用电子邮件发送</string>
+  <string name="delete_logs">删除日志</string>
  <string name="error_adding_treatment_message">一个治疗 (胰岛素: %1$.2f, 碳水: %2$d, 在: %3$s)不能被添加到治疗里。请检查并手动记录是合适的。</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d 克 (%2$d h), 延迟: %3$d 分钟</string>
  <string name="openaps_noasdata">Autosens 数据不可用</string>
  <string name="nav_logsettings">日志设置</string>
  <string name="resettodefaults">重置为默认值</string>
+  <string name="nsmalfunction">NSClient故障。 考虑Nightscout和NSClient重启。</string>
+  <string name="as">AS</string>
+  <string name="versionavailable">版本 %1$s 可用</string>
+  <string name="time_offset">时区偏移</string>
+  <string name="setupwizard_preferred_aps_mode">首选的APS模式</string>
+  <string name="treatments_wizard_total_label">总计</string>
+  <string name="calculation_short">计算</string>
+  <string name="handshaking">握手</string>
+  <string name="sendlogfiles">发送包括当前时间的今日的日志文件给开发者。描述一下意外情况</string>
  <plurals name="objective_days">
    <item quantity="other">%1$d　天</item>
  </plurals>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -490,7 +490,7 @@
    <string name="key_openapsama_bolussnooze_dia_divisor" translatable="false">bolussnooze_dia_divisor</string>
    <string name="openapsama_bolussnooze_dia_divisor_summary">Default value: 2\nBolus snooze is enacted after you do a meal bolus, so the loop won’t counteract with low temps when you’ve just eaten. The example here and default is 2; so a 3 hour DIA means that bolus snooze will be gradually phased out over 1.5 hours (3DIA/2).</string>
    <string name="openapsama_min_5m_carbimpact" translatable="false">min_5m_carbimpact</string>
-    <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0 This is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0 (AMA) or 8.0 (SMB). This is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
    <string name="openapsama_link_to_preferncejson_doc_txt">Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values.</string>
    <string name="openapsama_link_to_preferncejson_doc" translatable="false">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
    <string name="error_only_numeric_digits_allowed">Only numeric digits are allowed.</string>
@ -1058,7 +1058,7 @@
    <string name="setupwizard_language_prompt">Select your language</string>
    <string name="key_language" translatable="false">language</string>
    <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
-    <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$d</string>
+    <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
    <string name="firstinsulinincrement">First insulin increment</string>
    <string name="secondinsulinincrement">Second insulin increment</string>
    <string name="thirdinsulinincrement">Third insulin increment</string>
@ -1195,6 +1195,10 @@
    <string name="calculation_short">Calc</string>
    <string name="handshaking">Handshaking</string>
    <string name="sendlogfiles">Send today\'s log files to developers along with this time. Unexpected situation.</string>
+    <string name="maxbolusviolation">Max bolus violation</string>
+    <string name="commanderror">Command error</string>
+    <string name="speederror">Speed error</string>
+    <string name="insulinlimitviolation">Insulin limit violation</string>

    <plurals name="objective_days">
        <item quantity="one">%1$d day</item>
--- a/app/src/main/res/xml/pref_openapsama.xml
+++ b/app/src/main/res/xml/pref_openapsama.xml
@ -30,6 +30,19 @@
            android:summary="@string/openapsama_autosens_adjusttargets_summary"
            android:title="@string/openapsama_autosens_adjusttargets" />

+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:defaultValue="3.0"
+            android:dialogMessage="@string/openapsama_min_5m_carbimpact_summary"
+            android:inputType="numberDecimal"
+            android:key="@string/key_openapsama_min_5m_carbimpact"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/openapsama_min_5m_carbimpact"
+            validate:floatmaxNumber="12.0"
+            validate:floatminNumber="0.1"
+            validate:testType="floatNumericRange" />
+
        <PreferenceScreen android:title="@string/advancedsettings_title">

            <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">
--- a/wear/build.gradle
+++ b/wear/build.gradle
@ -47,6 +47,30 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
+
+    productFlavors {
+        flavorDimensions "standard"
+        full {
+            applicationId "info.nightscout.androidaps"
+            dimension "standard"
+            versionName version
+        }
+        pumpcontrol {
+            applicationId "info.nightscout.androidaps"
+            dimension "standard"
+            versionName version
+        }
+        nsclient {
+            applicationId "info.nightscout.nsclient"
+            dimension "standard"
+            versionName version + "-nsclient"
+        }
+        nsclient2 {
+            applicationId "info.nightscout.nsclient2"
+            dimension "standard"
+            versionName version + "-nsclient"
+        }
+    }
 }

 allprojects {