Skip to content

Commit 791e9d2

Browse files
Merge branch 'main' into development
2 parents f02230e + 53e8686 commit 791e9d2

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ android {
3030
targetSdk = 35
3131
versionCode 52
3232
versionName "2.5"
33-
3433
buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
3534
buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
3635

@@ -131,17 +130,17 @@ dependencies {
131130

132131
ksp "com.google.dagger:hilt-compiler:$hilt_compiler_version"
133132
ksp "androidx.hilt:hilt-compiler:$hilt_version"
134-
133+
135134
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
136135
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
137-
138136
implementation "androidx.room:room-runtime:$room_version"
139137
implementation "androidx.room:room-ktx:$room_version"
140138
ksp "androidx.room:room-compiler:$room_version"
141139

142140
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
143141
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
144142
androidTestImplementation "androidx.room:room-testing:$room_version"
143+
145144
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
146145
androidTestImplementation 'androidx.test:core:1.6.1'
147146
androidTestImplementation 'androidx.test:core-ktx:1.6.1'

app/src/main/java/de/seemoo/at_tracking_detection/database/repository/DeviceRepository.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package de.seemoo.at_tracking_detection.database.repository
33
import androidx.annotation.WorkerThread
44
import de.seemoo.at_tracking_detection.database.daos.DeviceDao
55
import de.seemoo.at_tracking_detection.database.models.device.BaseDevice
6-
import de.seemoo.at_tracking_detection.database.models.device.ConnectionState
76
import de.seemoo.at_tracking_detection.database.models.device.DeviceType
87
import de.seemoo.at_tracking_detection.database.relations.DeviceBeaconNotification
98
import de.seemoo.at_tracking_detection.util.Utility

0 commit comments

Comments
 (0)