Merge branch 'main' into task/documentation-tests

# Conflicts: # app/build.gradle.kts # app/src/main/java/edu/stanford/spezikt/bluetooth/BluetoothViewModel.kt # app/src/test/java/edu/stanford/spezikt/ExampleUnitTest.kt # build-logic/README.md # build-logic/convention/build.gradle.kts # build-logic/convention/src/main/kotlin/edu/stanford/spezikt/build/logic/convention/plugins/SpeziAbstractConfigPlugin.kt # build-logic/convention/src/main/kotlin/edu/stanford/spezikt/build/logic/convention/plugins/SpeziBaseConfigConventionPlugin.kt # core/bluetooth/README.md # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/api/BLEService.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/mapper/BloodPressureMapper.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/mapper/MeasurementMapper.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/mapper/WeightMeasurementMapper.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEDeviceSession.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEServiceEvent.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEServiceState.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEServiceType.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/Measurement.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/SupportedServices.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/di/BluetoothModule.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/domain/BLEDeviceConnector.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/domain/BLEDeviceScanner.kt # core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/domain/BLEServiceImpl.kt # core/coroutines/src/main/kotlin/edu/stanford/spezikt/coroutines/DispatchersProvider.kt # core/coroutines/src/main/kotlin/edu/stanford/spezikt/coroutines/di/CoroutinesModule.kt # core/coroutines/src/main/kotlin/edu/stanford/spezikt/coroutines/di/Dispatching.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/SpeziLogger.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/LogLogger.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/PrintLogger.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/TimberLogger.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/_Logger.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/models/LoggerConfig.kt # core/logging/src/main/kotlin/edu/stanford/spezi/logging/models/LoggingStrategy.kt # core/utils/build.gradle.kts # core/utils/src/main/java/edu/stanford/spezi/utils/Typealiases.kt # core/utils/src/main/java/edu/stanford/spezi/utils/UUID.kt # core/utils/src/main/java/edu/stanford/spezi/utils/extensions/List.kt # gradle/libs.versions.toml # settings.gradle.kts # spezi-module/contact/build.gradle.kts
StanfordSpezi · May 20, 2024 · 577a240 · 577a240
2 parents 51b2022 + 1aa3474
commit 577a240
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEServiceEvent.kt b/...bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/data/model/BLEServiceEvent.kt
@@ -59,5 +59,4 @@ sealed interface BLEServiceEvent {
      * @property measurement The measurement received from the device.
      */
     data class MeasurementReceived(val device: BluetoothDevice, val measurement: Measurement) : BLEServiceEvent
-}
-
+}
diff --git a/core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/domain/BLEDeviceScanner.kt b/core/bluetooth/src/main/java/edu/stanford/spezikt/core/bluetooth/domain/BLEDeviceScanner.kt
@@ -111,5 +111,4 @@ internal class BLEDeviceScanner @Inject constructor(
          */
         data class Failure(val errorCode: Int) : Event
     }
-}
-
+}
diff --git a/core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/_Logger.kt b/core/logging/src/main/kotlin/edu/stanford/spezi/logging/internal/_Logger.kt
@@ -43,7 +43,7 @@ sealed interface _Logger {
 
 /**
  * This function retrieves the current tag to be used for logging messages.
- * It considers any pending netxTag and resets the nextTag
+ * It considers any pending nextTag and resets the nextTag
  * property to null after retrieval.
  *
  * @return The current tag for logging.