From bad5f296dc917fb26993df68be0e6a54d5adab61 Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Tue, 28 Mar 2023 10:39:56 +0200 Subject: [PATCH] Fix project after BLEK refactoring --- profile_bps/build.gradle.kts | 2 +- .../android/bps/viewmodel/BPSViewModel.kt | 5 +++-- profile_cgms/build.gradle.kts | 2 +- .../android/cgms/repository/CGMService.kt | 7 +++--- profile_csc/build.gradle.kts | 2 +- .../android/csc/repository/CSCService.kt | 5 +++-- profile_gls/build.gradle.kts | 2 +- .../gls/main/viewmodel/GLSViewModel.kt | 7 +++--- profile_hrs/build.gradle.kts | 2 +- .../android/hrs/service/HRSService.kt | 5 +++-- profile_hts/build.gradle.kts | 2 +- .../android/hts/repository/HTSService.kt | 5 +++-- profile_prx/build.gradle.kts | 3 ++- .../android/prx/repository/PRXService.kt | 22 +++++++++---------- profile_rscs/build.gradle.kts | 2 +- .../android/rscs/repository/RSCSService.kt | 5 +++-- profile_uart/build.gradle.kts | 2 +- .../android/uart/repository/UARTService.kt | 6 ++--- 18 files changed, 47 insertions(+), 39 deletions(-) diff --git a/profile_bps/build.gradle.kts b/profile_bps/build.gradle.kts index 39c04e70..44a19433 100644 --- a/profile_bps/build.gradle.kts +++ b/profile_bps/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt index 615d69d1..560d91b1 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt @@ -54,9 +54,10 @@ import no.nordicsemi.android.bps.view.DisconnectEvent import no.nordicsemi.android.bps.view.OpenLoggerEvent import no.nordicsemi.android.common.navigation.NavigationResult import no.nordicsemi.android.common.navigation.Navigator +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData diff --git a/profile_cgms/build.gradle.kts b/profile_cgms/build.gradle.kts index 204279e2..b5af38be 100644 --- a/profile_cgms/build.gradle.kts +++ b/profile_cgms/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt index c0aa46d9..bd5512f6 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt @@ -43,10 +43,11 @@ import kotlinx.coroutines.launch import no.nordicsemi.android.ble.common.data.cgm.CGMSpecificOpsControlPointData import no.nordicsemi.android.cgms.data.CGMRecordWithSequenceNumber import no.nordicsemi.android.cgms.data.CGMServiceCommand +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattCharacteristic +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattCharacteristic -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.cgm.CGMFeatureParser diff --git a/profile_csc/build.gradle.kts b/profile_csc/build.gradle.kts index 016ed175..6549f56a 100644 --- a/profile_csc/build.gradle.kts +++ b/profile_csc/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt index 181abbd0..3058f5c0 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt @@ -40,9 +40,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.csc.CSCDataParser diff --git a/profile_gls/build.gradle.kts b/profile_gls/build.gradle.kts index ed4598d9..03bd4f2a 100644 --- a/profile_gls/build.gradle.kts +++ b/profile_gls/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.chart) diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt index 14feaa78..e93f3003 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt @@ -58,10 +58,11 @@ import no.nordicsemi.android.gls.main.view.GLSViewState import no.nordicsemi.android.gls.main.view.OnGLSRecordClick import no.nordicsemi.android.gls.main.view.OnWorkingModeSelected import no.nordicsemi.android.gls.main.view.OpenLoggerEvent +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattCharacteristic +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattCharacteristic -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.gls.GlucoseMeasurementContextParser diff --git a/profile_hrs/build.gradle.kts b/profile_hrs/build.gradle.kts index 470c8a69..3915e9ac 100644 --- a/profile_hrs/build.gradle.kts +++ b/profile_hrs/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.chart) diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt index 4240f176..53791efa 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt @@ -40,9 +40,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.hrs.BodySensorLocationParser diff --git a/profile_hts/build.gradle.kts b/profile_hts/build.gradle.kts index 66296ad1..2f90cf11 100644 --- a/profile_hts/build.gradle.kts +++ b/profile_hts/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt index 7094c524..f4b37f4b 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt @@ -40,9 +40,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.hts.HTSDataParser diff --git a/profile_prx/build.gradle.kts b/profile_prx/build.gradle.kts index 58cea4fe..e59fb25d 100644 --- a/profile_prx/build.gradle.kts +++ b/profile_prx/build.gradle.kts @@ -45,7 +45,8 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:server:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt index 55c6d953..7f95f71a 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt @@ -33,7 +33,6 @@ package no.nordicsemi.android.prx.repository import android.annotation.SuppressLint import android.content.Intent -import android.util.Log import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.filterNotNull @@ -41,25 +40,26 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattCharacteristic +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.BleGattConnectOptions -import no.nordicsemi.android.kotlin.ble.core.client.BleWriteType -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattCharacteristic -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices +import no.nordicsemi.android.kotlin.ble.core.data.BleGattConnectOptions import no.nordicsemi.android.kotlin.ble.core.data.BleGattConnectionStatus import no.nordicsemi.android.kotlin.ble.core.data.BleGattPermission import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty +import no.nordicsemi.android.kotlin.ble.core.data.BleWriteType import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState -import no.nordicsemi.android.kotlin.ble.core.server.BleGattServer -import no.nordicsemi.android.kotlin.ble.core.server.service.service.BleGattServerServiceType -import no.nordicsemi.android.kotlin.ble.core.server.service.service.BleServerGattCharacteristicConfig -import no.nordicsemi.android.kotlin.ble.core.server.service.service.BleServerGattServiceConfig -import no.nordicsemi.android.kotlin.ble.core.server.service.service.BluetoothGattServerConnection import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.prx.AlarmLevel import no.nordicsemi.android.kotlin.ble.profile.prx.AlarmLevelParser import no.nordicsemi.android.kotlin.ble.profile.prx.AlertLevelInputParser +import no.nordicsemi.android.kotlin.ble.server.main.BleGattServer +import no.nordicsemi.android.kotlin.ble.server.main.service.BleGattServerServiceType +import no.nordicsemi.android.kotlin.ble.server.main.service.BleServerGattCharacteristicConfig +import no.nordicsemi.android.kotlin.ble.server.main.service.BleServerGattServiceConfig +import no.nordicsemi.android.kotlin.ble.server.main.service.BluetoothGattServerConnection import no.nordicsemi.android.service.DEVICE_DATA import no.nordicsemi.android.service.NotificationService import java.util.* diff --git a/profile_rscs/build.gradle.kts b/profile_rscs/build.gradle.kts index 513505bc..f02e760a 100644 --- a/profile_rscs/build.gradle.kts +++ b/profile_rscs/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.nordic.ble.common) diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt index e29b9b1e..b633cf96 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt @@ -40,9 +40,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.rscs.RSCSDataParser diff --git a/profile_uart/build.gradle.kts b/profile_uart/build.gradle.kts index aaec288c..edec1caa 100644 --- a/profile_uart/build.gradle.kts +++ b/profile_uart/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation(project(":lib_ui")) implementation(project(":lib_utils")) - implementation("no.nordicsemi.android.kotlin.ble:core:0.0.1") + implementation("no.nordicsemi.android.kotlin.ble:client:0.0.1") implementation("no.nordicsemi.android.kotlin.ble:profile:0.0.1") implementation(libs.room.runtime) diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt index e5d93161..adbfa795 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt @@ -40,12 +40,12 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import no.nordicsemi.android.kotlin.ble.client.main.callback.BleGattClient +import no.nordicsemi.android.kotlin.ble.client.main.connect +import no.nordicsemi.android.kotlin.ble.client.main.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.ServerDevice -import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient -import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser -import no.nordicsemi.android.kotlin.ble.profile.hrs.HRSDataParser import no.nordicsemi.android.service.DEVICE_DATA import no.nordicsemi.android.service.NotificationService import java.util.*