From 1204200bf68897cf74e0961bf81aad2dfd4a2efb Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 11 Sep 2023 19:21:13 +0200 Subject: [PATCH] kotlin 1.9.10 --- build.gradle | 2 +- .../java/info/nightscout/database/entities/APSResult.kt | 2 +- .../info/nightscout/database/entities/APSResultLink.kt | 2 +- .../nightscout/database/entities/MultiwaveBolusLink.kt | 2 +- .../database/entities/embedments/InterfaceIDs.kt | 7 ++++++- .../info/nightscout/database/impl/daos/APSResultDao.kt | 2 +- .../info/nightscout/database/impl/daos/APSResultLinkDao.kt | 2 +- .../database/impl/daos/BolusCalculatorResultDao.kt | 2 +- .../java/info/nightscout/database/impl/daos/BolusDao.kt | 2 +- .../java/info/nightscout/database/impl/daos/CarbsDao.kt | 2 +- .../database/impl/daos/EffectiveProfileSwitchDao.kt | 2 +- .../info/nightscout/database/impl/daos/ExtendedBolusDao.kt | 2 +- .../info/nightscout/database/impl/daos/GlucoseValueDao.kt | 2 +- .../nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt | 2 +- .../info/nightscout/database/impl/daos/OfflineEventDao.kt | 2 +- .../nightscout/database/impl/daos/PreferenceChangeDao.kt | 2 +- .../info/nightscout/database/impl/daos/ProfileSwitchDao.kt | 2 +- .../nightscout/database/impl/daos/TemporaryBasalDao.kt | 2 +- .../nightscout/database/impl/daos/TemporaryTargetDao.kt | 2 +- .../info/nightscout/database/impl/daos/TherapyEventDao.kt | 2 +- .../nightscout/database/impl/daos/TotalDailyDoseDao.kt | 2 +- .../info/nightscout/database/impl/daos/VersionChangeDao.kt | 2 +- 22 files changed, 27 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 40ca8101a1..3a4994d247 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { ext { - kotlin_version = '1.8.22' + kotlin_version = '1.9.10' core_version = '1.10.1' rxjava_version = '3.1.7' rxandroid_version = '3.0.2' diff --git a/database/entities/src/main/java/info/nightscout/database/entities/APSResult.kt b/database/entities/src/main/java/info/nightscout/database/entities/APSResult.kt index 0f3f1ce826..817651ff25 100644 --- a/database/entities/src/main/java/info/nightscout/database/entities/APSResult.kt +++ b/database/entities/src/main/java/info/nightscout/database/entities/APSResult.kt @@ -24,7 +24,7 @@ data class APSResult( override var isValid: Boolean = true, override var referenceId: Long? = null, @Embedded - override var interfaceIDs_backing: InterfaceIDs? = null, + override var interfaceIDs_backing: InterfaceIDs? = null, override var timestamp: Long, override var utcOffset: Long = TimeZone.getDefault().getOffset(timestamp).toLong(), var algorithm: Algorithm, diff --git a/database/entities/src/main/java/info/nightscout/database/entities/APSResultLink.kt b/database/entities/src/main/java/info/nightscout/database/entities/APSResultLink.kt index 8a3ae8a08f..7c50fa5057 100644 --- a/database/entities/src/main/java/info/nightscout/database/entities/APSResultLink.kt +++ b/database/entities/src/main/java/info/nightscout/database/entities/APSResultLink.kt @@ -35,7 +35,7 @@ data class APSResultLink( override var isValid: Boolean = true, override var referenceId: Long? = null, @Embedded - override var interfaceIDs_backing: InterfaceIDs? = null, + override var interfaceIDs_backing: InterfaceIDs? = null, var apsResultId: Long, var smbId: Long? = null, var tbrId: Long? = null diff --git a/database/entities/src/main/java/info/nightscout/database/entities/MultiwaveBolusLink.kt b/database/entities/src/main/java/info/nightscout/database/entities/MultiwaveBolusLink.kt index 8057d40588..b15e90753f 100644 --- a/database/entities/src/main/java/info/nightscout/database/entities/MultiwaveBolusLink.kt +++ b/database/entities/src/main/java/info/nightscout/database/entities/MultiwaveBolusLink.kt @@ -31,7 +31,7 @@ data class MultiwaveBolusLink( override var isValid: Boolean = true, override var referenceId: Long? = null, @Embedded - override var interfaceIDs_backing: InterfaceIDs? = null, + override var interfaceIDs_backing: InterfaceIDs? = null, var bolusId: Long, var extendedBolusId: Long ) : TraceableDBEntry { diff --git a/database/entities/src/main/java/info/nightscout/database/entities/embedments/InterfaceIDs.kt b/database/entities/src/main/java/info/nightscout/database/entities/embedments/InterfaceIDs.kt index a711ef22e5..666f310c2e 100644 --- a/database/entities/src/main/java/info/nightscout/database/entities/embedments/InterfaceIDs.kt +++ b/database/entities/src/main/java/info/nightscout/database/entities/embedments/InterfaceIDs.kt @@ -1,6 +1,8 @@ package info.nightscout.database.entities.embedments -data class InterfaceIDs( +import androidx.room.Ignore + +data class InterfaceIDs @Ignore constructor( var nightscoutSystemId: String? = null, var nightscoutId: String? = null, var pumpType: PumpType? = null, // if == USER pumpSerial & pumpId can be null @@ -11,6 +13,9 @@ data class InterfaceIDs( var endId: Long? = null ) { + // Along with @Ignore main constructor eliminate kotlin 1.9 + room warning + constructor() : this(nightscoutSystemId = null, nightscoutId = null, pumpType = null, pumpSerial = null, temporaryId = null, pumpId = null, startId = null, endId = null) + enum class PumpType { GENERIC_AAPS, CELLNOVO, diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultDao.kt index c16a81486f..4b24b308be 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultDao.kt @@ -22,5 +22,5 @@ internal interface APSResultDao : TraceableDao { override fun deleteTrackedChanges(): Int @Query("SELECT * FROM $TABLE_APS_RESULTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultLinkDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultLinkDao.kt index 31c99be5ad..68263c75e5 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultLinkDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultLinkDao.kt @@ -22,5 +22,5 @@ internal interface APSResultLinkDao : TraceableDao { override fun deleteTrackedChanges(): Int @Query("SELECT * FROM $TABLE_APS_RESULT_LINKS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt index 2cd4c7d3b3..1758a12f74 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt @@ -50,5 +50,5 @@ internal interface BolusCalculatorResultDao : TraceableDao @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt index 5fbe85c564..636a235b02 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt @@ -71,5 +71,5 @@ internal interface BolusDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_BOLUSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt index 5d8834094c..c5cb525201 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt @@ -67,5 +67,5 @@ internal interface CarbsDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_CARBS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt index a8b9c7f168..3b4270e583 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt @@ -61,6 +61,6 @@ internal interface EffectiveProfileSwitchDao : TraceableDao @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt index 8d85c3e6ae..cb138a01b7 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt @@ -68,6 +68,6 @@ internal interface ExtendedBolusDao : TraceableDao { fun getOldestRecord(): ExtendedBolus? @Query("SELECT * FROM $TABLE_EXTENDED_BOLUSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt index 9f6601da65..89ad9a57cf 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt @@ -55,5 +55,5 @@ internal interface GlucoseValueDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_GLUCOSE_VALUES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt index 26a8cfad20..85a7d34fe0 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt @@ -21,5 +21,5 @@ internal interface MultiwaveBolusLinkDao : TraceableDao { override fun deleteTrackedChanges(): Int @Query("SELECT * FROM $TABLE_MULTIWAVE_BOLUS_LINKS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt index 7d0e74350f..45f38f69bf 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt @@ -46,5 +46,5 @@ internal interface OfflineEventDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/PreferenceChangeDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/PreferenceChangeDao.kt index 60896ddcbd..c189e31c92 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/PreferenceChangeDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/PreferenceChangeDao.kt @@ -16,6 +16,6 @@ interface PreferenceChangeDao { fun deleteOlderThan(than: Long): Int @Query("SELECT * FROM $TABLE_PREFERENCE_CHANGES WHERE timestamp > :since AND timestamp <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt index dc62152b4a..f867ca04ae 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt @@ -59,7 +59,7 @@ internal interface ProfileSwitchDao : info.nightscout.database.impl.daos.workaro fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_PROFILE_SWITCHES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } internal fun ProfileSwitchDao.insertNewEntryImpl(entry: ProfileSwitch): Long { diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt index ea559c7a50..8e9683ca7f 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt @@ -80,5 +80,5 @@ internal interface TemporaryBasalDao : TraceableDao { fun getOldestRecord(): TemporaryBasal? @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt index 2b6bb67f30..7e728d8766 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt @@ -49,5 +49,5 @@ internal interface TemporaryTargetDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_TEMPORARY_TARGETS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt index 70113ad484..29c069bd97 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt @@ -61,5 +61,5 @@ internal interface TherapyEventDao : TraceableDao { fun getCurrentFromHistoric(referenceId: Long): Maybe @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/TotalDailyDoseDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/TotalDailyDoseDao.kt index 35eaac29e5..7dbfa8ee41 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/TotalDailyDoseDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/TotalDailyDoseDao.kt @@ -36,7 +36,7 @@ internal interface TotalDailyDoseDao : TraceableDao { fun getLastTotalDailyDoses(count: Int, exclude: InterfaceIDs.PumpType = InterfaceIDs.PumpType.CACHE): Single> @Query("SELECT * FROM $TABLE_TOTAL_DAILY_DOSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List @Query("DELETE FROM $TABLE_TOTAL_DAILY_DOSES WHERE timestamp >= :since AND pumpType = :pumpType") fun deleteNewerThan(since: Long, pumpType: InterfaceIDs.PumpType) diff --git a/database/impl/src/main/java/info/nightscout/database/impl/daos/VersionChangeDao.kt b/database/impl/src/main/java/info/nightscout/database/impl/daos/VersionChangeDao.kt index a93e00b812..be65faff0d 100644 --- a/database/impl/src/main/java/info/nightscout/database/impl/daos/VersionChangeDao.kt +++ b/database/impl/src/main/java/info/nightscout/database/impl/daos/VersionChangeDao.kt @@ -19,6 +19,6 @@ interface VersionChangeDao { fun getMostRecentVersionChange(): VersionChange? @Query("SELECT * FROM $TABLE_VERSION_CHANGES WHERE timestamp > :since AND timestamp <= :until LIMIT :limit OFFSET :offset") - suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List + fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List } \ No newline at end of file