diff --git a/appcompose/build.gradle b/appcompose/build.gradle index a30d5e98..433163f8 100644 --- a/appcompose/build.gradle +++ b/appcompose/build.gradle @@ -68,12 +68,12 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.01') implementation composeBom androidTestImplementation composeBom implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.activity:activity-compose:1.7.2' + implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.compose.material3:material3' implementation "com.google.accompanist:accompanist-swiperefresh:0.30.1" @@ -86,10 +86,11 @@ dependencies { implementation "cafe.adriel.voyager:voyager-koin:$voyager" implementation "cafe.adriel.voyager:voyager-transitions:$voyager" - debugImplementation "androidx.compose.ui:ui-tooling:1.4.3" - implementation "androidx.compose.ui:ui-tooling-preview:1.4.3" + def tooling = "1.6.2" + debugImplementation "androidx.compose.ui:ui-tooling:$tooling" + implementation "androidx.compose.ui:ui-tooling-preview:$tooling" - def lifecycle_version = "2.6.1" + def lifecycle_version = "2.7.0" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" @@ -111,7 +112,8 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3' androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" + def lifecycle = "2.7.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle" + implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle" } \ No newline at end of file diff --git a/db/build.gradle b/db/build.gradle index 302f00ca..89c0913d 100644 --- a/db/build.gradle +++ b/db/build.gradle @@ -76,7 +76,7 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - def room_version = "2.4.3" + def room_version = "2.6.1" api "androidx.room:room-runtime:$room_version" api "androidx.room:room-ktx:$room_version" kapt "androidx.room:room-compiler:$room_version" diff --git a/db/src/main/java/com/readrops/db/dao/BaseDao.kt b/db/src/main/java/com/readrops/db/dao/BaseDao.kt index e070c04f..b997b3a5 100644 --- a/db/src/main/java/com/readrops/db/dao/BaseDao.kt +++ b/db/src/main/java/com/readrops/db/dao/BaseDao.kt @@ -17,17 +17,17 @@ interface BaseDao { fun compatInsert(entity: T): Long @Insert - fun insert(entities: List?): List + fun insert(entities: List): List @Update fun update(entity: T): Completable @Update - fun update(entities: List?): Completable + fun update(entities: List): Completable @Delete fun delete(entity: T): Completable @Delete - fun delete(entities: List?): Completable + fun delete(entities: List): Completable } \ No newline at end of file diff --git a/db/src/main/java/com/readrops/db/dao/newdao/NewBaseDao.kt b/db/src/main/java/com/readrops/db/dao/newdao/NewBaseDao.kt index 8f41e43d..63528a00 100644 --- a/db/src/main/java/com/readrops/db/dao/newdao/NewBaseDao.kt +++ b/db/src/main/java/com/readrops/db/dao/newdao/NewBaseDao.kt @@ -10,17 +10,17 @@ interface NewBaseDao { suspend fun insert(entity: T): Long @Insert - suspend fun insert(entities: List?): List + suspend fun insert(entities: List): List @Update suspend fun update(entity: T) @Update - suspend fun update(entities: List?) + suspend fun update(entities: List) @Delete suspend fun delete(entity: T) @Delete - suspend fun delete(entities: List?) + suspend fun delete(entities: List) } \ No newline at end of file