Merge branch 'release/1.6.x' into fix/1.6.x-into-1.7.x
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTrackerStorage.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/flow/HotDataFlow.kt # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt # gradle.properties
No related branches found
No related tags found
Showing
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTrackerStorage.kt 5 additions, 0 deletions...dules/detectiontracker/ExposureDetectionTrackerStorage.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/flow/HotDataFlow.kt 27 additions, 10 deletions...c/main/java/de/rki/coronawarnapp/util/flow/HotDataFlow.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/serialization/GsonExtensions.kt 3 additions, 2 deletions...de/rki/coronawarnapp/util/serialization/GsonExtensions.kt
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/ExposureDetectionTrackerStorageTest.kt 16 additions, 0 deletions...s/detectiontracker/ExposureDetectionTrackerStorageTest.kt
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt 89 additions, 3 deletions...st/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt
- Corona-Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt 16 additions, 6 deletions...Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt
Loading
Please register or sign in to comment