merge :pump:pump-core and :pump:pump-common

app/build.gradle

@@ -216,7 +216,6 @@ dependencies {
     implementation project(':insight')
     implementation project(':pump:medtronic')
     implementation project(':pump:pump-common')
-    implementation project(':pump:pump-core')
     implementation project(':pump:omnipod-common')
     implementation project(':pump:omnipod-eros')
     implementation project(':pump:omnipod-dash')

pump/medtronic/build.gradle

@@ -22,7 +22,6 @@ dependencies {
     implementation project(':core:utils')
     implementation project(':core:validators')
     implementation project(':pump:pump-common')
-    implementation project(':pump:pump-core')
     implementation project(':pump:rileylink')
 
     testImplementation project(':app-wear-shared:shared-tests')

pump/omnipod-eros/build.gradle

@@ -34,7 +34,6 @@ dependencies {
     implementation project(':core:ui')
     implementation project(':core:validators')
     implementation project(':pump:pump-common')
-    implementation project(':pump:pump-core')
     implementation project(':pump:rileylink')
     implementation project(':pump:omnipod-common')
 

pump/pump-common/src/main/java/info/nightscout/pump/core/defs/PumpDeviceState.kt

@@ -1,6 +1,6 @@
 package info.nightscout.pump.core.defs
 
-import info.nightscout.pump.core.R
+import info.nightscout.pump.common.R
 
 enum class PumpDeviceState(var resourceId: Int) {
 

pump/pump-common/src/main/res/values/strings.xml

@@ -77,6 +77,16 @@
     <string name="pump_history_type">Type:</string>
 
 
+    <!-- PumpDeviceState -->
+    <string name="pump_status_never_contacted">Never contacted</string>
+    <string name="pump_status_sleeping">Sleeping</string>
+    <string name="pump_status_waking_up">Waking up</string>
+    <string name="pump_status_active">Active</string>
+    <string name="pump_status_error_comm">Error with communication</string>
+    <string name="pump_status_timeout_comm">Timeout on communication</string>
+    <string name="pump_status_pump_unreachable">Pump unreachable</string>
+    <string name="pump_status_invalid_config">Invalid configuration</string>
+
     <plurals name="duration_days">
         <item quantity="one">%1$d day</item>
         <item quantity="other">%1$d days</item>

pump/pump-core/.gitignore

@@ -1 +0,0 @@
-/build

pump/pump-core/build.gradle

@@ -1,19 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-android {
-    namespace 'info.nightscout.pump.core'
-}
-
-dependencies {
-    api "net.danlew:android.joda:$joda_version"
-}

pump/pump-core/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

pump/pump-core/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>

pump/pump-core/src/main/res/values-af-rZA/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_sleeping">Slaap</string>
-    <string name="pump_status_waking_up">Besig om te wek</string>
-    <string name="pump_status_active">Aktief</string>
-    <string name="pump_status_error_comm">Fout met kommunikasie</string>
-    <string name="pump_status_timeout_comm">Te lank op kommunikasie gewag</string>
-    <string name="pump_status_pump_unreachable">Pomp onbereikbaar</string>
-    <string name="pump_status_invalid_config">Ongeldige konfigirasie</string>
-</resources>

pump/pump-core/src/main/res/values-bg-rBG/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Никога не е свързвана</string>
-    <string name="pump_status_sleeping">Спинка си</string>
-    <string name="pump_status_waking_up">Събуждане</string>
-    <string name="pump_status_active">Активна</string>
-    <string name="pump_status_error_comm">Грешка в комуникацията</string>
-    <string name="pump_status_timeout_comm">Изтече времето за връзка</string>
-    <string name="pump_status_pump_unreachable">Помпата е недостъпна</string>
-    <string name="pump_status_invalid_config">Грешна конфигурация</string>
-</resources>

pump/pump-core/src/main/res/values-ca-rES/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_sleeping">En suspens</string>
-    <string name="pump_status_waking_up">Iniciant</string>
-    <string name="pump_status_active">Activa</string>
-    <string name="pump_status_error_comm">Error de comunicació</string>
-    <string name="pump_status_timeout_comm">Temps d\'espera excedit en la comunicació</string>
-    <string name="pump_status_pump_unreachable">Bomba no accessible</string>
-    <string name="pump_status_invalid_config">Configuració no vàlida</string>
-</resources>

pump/pump-core/src/main/res/values-cs-rCZ/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nikdy nekontaktováno</string>
-    <string name="pump_status_sleeping">Spící</string>
-    <string name="pump_status_waking_up">Probouzení</string>
-    <string name="pump_status_active">Aktivní</string>
-    <string name="pump_status_error_comm">Chyba komunikace</string>
-    <string name="pump_status_timeout_comm">Vypršel časový limit komunikace</string>
-    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="pump_status_invalid_config">Neplatná konfigurace</string>
-</resources>

pump/pump-core/src/main/res/values-da-rDK/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_sleeping">Sover</string>
-    <string name="pump_status_waking_up">Vågner</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_error_comm">Fejl i kommunikation</string>
-    <string name="pump_status_timeout_comm">Timeout ved kommunikation</string>
-    <string name="pump_status_pump_unreachable">Pumpe utilgængelig</string>
-    <string name="pump_status_invalid_config">Ugyldig konfiguration</string>
-</resources>

pump/pump-core/src/main/res/values-de-rDE/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Noch nie verbunden</string>
-    <string name="pump_status_sleeping">Schlafen</string>
-    <string name="pump_status_waking_up">Aufwecken</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_error_comm">Fehler bei der Kommunikation</string>
-    <string name="pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
-    <string name="pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
-    <string name="pump_status_invalid_config">Ungültige Einstellung</string>
-</resources>

pump/pump-core/src/main/res/values-el-rGR/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Δεν επικοινωνήθηκε ποτέ</string>
-    <string name="pump_status_sleeping">Sleeping</string>
-    <string name="pump_status_waking_up">Ξύπνημα</string>
-    <string name="pump_status_active">Ενεργή</string>
-    <string name="pump_status_error_comm">Σφάλμα με επικοινωνία</string>
-    <string name="pump_status_timeout_comm">Λήξη χρόνου επικοινωνίας</string>
-    <string name="pump_status_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
-    <string name="pump_status_invalid_config">Μη έγκυρη παραμετροποίηση</string>
-</resources>

pump/pump-core/src/main/res/values-es-rES/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nunca contactado</string>
-    <string name="pump_status_sleeping">Durmiendo</string>
-    <string name="pump_status_waking_up">Activando</string>
-    <string name="pump_status_active">Activo</string>
-    <string name="pump_status_error_comm">Error con la comunicación</string>
-    <string name="pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
-    <string name="pump_status_pump_unreachable">Bomba no alcanzable</string>
-    <string name="pump_status_invalid_config">Configuración inválida</string>
-</resources>

pump/pump-core/src/main/res/values-fr-rFR/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Jamais contacté</string>
-    <string name="pump_status_sleeping">En veille</string>
-    <string name="pump_status_waking_up">Réveil en cours</string>
-    <string name="pump_status_active">Actif</string>
-    <string name="pump_status_error_comm">Erreur de communication</string>
-    <string name="pump_status_timeout_comm">Expiration du délai d\'attente de la communication</string>
-    <string name="pump_status_pump_unreachable">Pompe hors de portée</string>
-    <string name="pump_status_invalid_config">Configuration invalide</string>
-</resources>

pump/pump-core/src/main/res/values-ga-rIE/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_active">Gníomhach</string>
-</resources>

pump/pump-core/src/main/res/values-hr-rHR/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_pump_unreachable">Pumpa nedostupna</string>
-</resources>

pump/pump-core/src/main/res/values-hu-rHU/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_pump_unreachable">Pumpa nem elérhető</string>
-</resources>

pump/pump-core/src/main/res/values-it-rIT/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Mai contattato</string>
-    <string name="pump_status_sleeping">In sospensione</string>
-    <string name="pump_status_waking_up">Risveglio</string>
-    <string name="pump_status_active">Attivo</string>
-    <string name="pump_status_error_comm">Errore nella comunicazione</string>
-    <string name="pump_status_timeout_comm">Timeout della comunicazione</string>
-    <string name="pump_status_pump_unreachable">Micro irraggiungibile</string>
-    <string name="pump_status_invalid_config">Configurazione non valida</string>
-</resources>

pump/pump-core/src/main/res/values-iw-rIL/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">מעולם לא נוצר קשר</string>
-    <string name="pump_status_sleeping">שינה</string>
-    <string name="pump_status_waking_up">מתעורר</string>
-    <string name="pump_status_active">פעיל</string>
-    <string name="pump_status_error_comm">שגיאת תקשורת</string>
-    <string name="pump_status_timeout_comm">חריגה ממגבלת הזמן לתקשורת</string>
-    <string name="pump_status_pump_unreachable">המשאבה לא זמינה</string>
-    <string name="pump_status_invalid_config">תצורה לא חוקית</string>
-</resources>

pump/pump-core/src/main/res/values-ja-rJP/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-</resources>

pump/pump-core/src/main/res/values-ko-rKR/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">연결되지 않음</string>
-    <string name="pump_status_sleeping">수면</string>
-    <string name="pump_status_waking_up">시작중</string>
-    <string name="pump_status_active">활성</string>
-    <string name="pump_status_error_comm">연결오류</string>
-    <string name="pump_status_timeout_comm">연결시간초과</string>
-    <string name="pump_status_pump_unreachable">펌프에 연결할 수 없습니다.</string>
-    <string name="pump_status_invalid_config">유효하지 않은 설정</string>
-</resources>

pump/pump-core/src/main/res/values-lt-rLT/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Niekada nebuvo sujungta</string>
-    <string name="pump_status_sleeping">Miego režime</string>
-    <string name="pump_status_waking_up">Pažadinimas</string>
-    <string name="pump_status_active">Aktyvi</string>
-    <string name="pump_status_error_comm">Ryšio klaida</string>
-    <string name="pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
-    <string name="pump_status_pump_unreachable">Pompa nepasiekiama</string>
-    <string name="pump_status_invalid_config">Neteisinga konfigūracija</string>
-</resources>

pump/pump-core/src/main/res/values-nl-rNL/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nooit verbonden</string>
-    <string name="pump_status_sleeping">Slapen</string>
-    <string name="pump_status_waking_up">Actief worden</string>
-    <string name="pump_status_active">Actief</string>
-    <string name="pump_status_error_comm">Communicatiefout</string>
-    <string name="pump_status_timeout_comm">Time-out bij communicatie</string>
-    <string name="pump_status_pump_unreachable">Pomp niet beschikbaar</string>
-    <string name="pump_status_invalid_config">Ongeldige configuratie</string>
-</resources>

pump/pump-core/src/main/res/values-no-rNO/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Aldri kontaktet</string>
-    <string name="pump_status_sleeping">Hvilemodus</string>
-    <string name="pump_status_waking_up">Våkner opp</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_error_comm">Feil med kommunikasjonen</string>
-    <string name="pump_status_timeout_comm">Tidsavbrudd ved kommunikasjonen</string>
-    <string name="pump_status_pump_unreachable">Pumpe er utilgjengelig</string>
-    <string name="pump_status_invalid_config">Ugyldig oppsett av pumpe</string>
-</resources>

pump/pump-core/src/main/res/values-pl-rPL/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nigdy nie połączona</string>
-    <string name="pump_status_sleeping">Uśpiona</string>
-    <string name="pump_status_waking_up">Wybudzanie</string>
-    <string name="pump_status_active">Aktywna</string>
-    <string name="pump_status_error_comm">Błąd komunikacji</string>
-    <string name="pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
-    <string name="pump_status_pump_unreachable">Pompa nieosiągalna</string>
-    <string name="pump_status_invalid_config">Nieprawidłowe ustawienia</string>
-</resources>

pump/pump-core/src/main/res/values-pt-rBR/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nunca contatado</string>
-    <string name="pump_status_sleeping">Dormindo</string>
-    <string name="pump_status_waking_up">Acordar</string>
-    <string name="pump_status_active">Ativo</string>
-    <string name="pump_status_error_comm">Erro com comunicação</string>
-    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="pump_status_invalid_config">Configuração inválida</string>
-</resources>

pump/pump-core/src/main/res/values-pt-rPT/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nunca contactado</string>
-    <string name="pump_status_sleeping">A dormir</string>
-    <string name="pump_status_waking_up">A acordar</string>
-    <string name="pump_status_active">Activo</string>
-    <string name="pump_status_error_comm">Erro com comunicação</string>
-    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="pump_status_invalid_config">Configuração inválida</string>
-</resources>

pump/pump-core/src/main/res/values-ro-rRO/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_sleeping">În repaus</string>
-    <string name="pump_status_waking_up">Se pornește</string>
-    <string name="pump_status_active">Activă</string>
-    <string name="pump_status_error_comm">Eroare de comunicație</string>
-    <string name="pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
-    <string name="pump_status_pump_unreachable">Pompă indisponibilă</string>
-    <string name="pump_status_invalid_config">Configurație invalidă</string>
-</resources>

pump/pump-core/src/main/res/values-ru-rRU/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Никогда не подключалась</string>
-    <string name="pump_status_sleeping">Спящий режим</string>
-    <string name="pump_status_waking_up">Пробуждение</string>
-    <string name="pump_status_active">Работает</string>
-    <string name="pump_status_error_comm">Ошибка связи</string>
-    <string name="pump_status_timeout_comm">Таймаут связи</string>
-    <string name="pump_status_pump_unreachable">Помпа недоступна</string>
-    <string name="pump_status_invalid_config">Недопустимая конфигурация</string>
-</resources>

pump/pump-core/src/main/res/values-sk-rSK/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Nikdy nepripojené</string>
-    <string name="pump_status_sleeping">Spiaca</string>
-    <string name="pump_status_waking_up">Prebúdzanie</string>
-    <string name="pump_status_active">Aktívna</string>
-    <string name="pump_status_error_comm">Chyba komunikácie</string>
-    <string name="pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
-    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="pump_status_invalid_config">Neplatná konfigurácia</string>
-</resources>

pump/pump-core/src/main/res/values-sr-rCS/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-</resources>

pump/pump-core/src/main/res/values-sv-rSE/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Aldrig ansluten</string>
-    <string name="pump_status_sleeping">Sover</string>
-    <string name="pump_status_waking_up">Väcker</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_error_comm">Kommunikationsfel</string>
-    <string name="pump_status_timeout_comm">Kommunikationstimeout</string>
-    <string name="pump_status_pump_unreachable">Pumpen kan inte nås</string>
-    <string name="pump_status_invalid_config">Felaktig konfiguration</string>
-</resources>

pump/pump-core/src/main/res/values-tr-rTR/strings.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Hiç bağlantı yapılmadı</string>
-    <string name="pump_status_sleeping">Uyuyor</string>
-    <string name="pump_status_waking_up">Uyanıyor</string>
-    <string name="pump_status_active">Aktif</string>
-    <string name="pump_status_error_comm">İletişim hatası</string>
-    <string name="pump_status_timeout_comm">İletişimde zaman aşımı</string>
-    <string name="pump_status_pump_unreachable">Pompa ulaşılamıyor</string>
-    <string name="pump_status_invalid_config">Geçersiz yapılandırma</string>
-</resources>

pump/pump-core/src/main/res/values-uk-rUA/strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-</resources>

pump/pump-core/src/main/res/values-zh-rCN/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- PumpDeviceState -->
-    <string name="pump_status_sleeping">休眠</string>
-    <string name="pump_status_waking_up">唤醒中</string>
-    <string name="pump_status_active">启用</string>
-    <string name="pump_status_error_comm">通信出错</string>
-    <string name="pump_status_timeout_comm">通信超时</string>
-    <string name="pump_status_pump_unreachable">泵无法连接</string>
-    <string name="pump_status_invalid_config">无效配置</string>
-</resources>

pump/pump-core/src/main/res/values/strings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- PumpDeviceState -->
-    <string name="pump_status_never_contacted">Never contacted</string>
-    <string name="pump_status_sleeping">Sleeping</string>
-    <string name="pump_status_waking_up">Waking up</string>
-    <string name="pump_status_active">Active</string>
-    <string name="pump_status_error_comm">Error with communication</string>
-    <string name="pump_status_timeout_comm">Timeout on communication</string>
-    <string name="pump_status_pump_unreachable">Pump unreachable</string>
-    <string name="pump_status_invalid_config">Invalid configuration</string>
-
-</resources>

pump/rileylink/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
     implementation project(':core:ui')
-    implementation project(':pump:pump-core')
+    implementation project(':pump:pump-common')
 
     testImplementation project(':app-wear-shared:shared-tests')
 }

settings.gradle

@@ -39,7 +39,6 @@ include ':pump:omnipod-common'
 include ':pump:omnipod-eros'
 include ':pump:omnipod-dash'
 include ':pump:pump-common'
-include ':pump:pump-core'
 include ':pump:rileylink'
 include ':pump:virtual'
 include ':implementation'