Skip to content

Commit f707a22

Browse files
committed
update android studio E
1 parent b808833 commit f707a22

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

app/build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins {
1515
jacoco
1616
}
1717

18+
@Suppress("UnstableApiUsage")
1819
android {
1920
namespace = "com.example.moviedb"
2021
defaultConfig {
@@ -144,7 +145,7 @@ android {
144145

145146
dependencies {
146147
// common
147-
implementation("androidx.appcompat:appcompat:1.5.1")
148+
implementation("androidx.appcompat:appcompat:1.6.0")
148149
implementation("androidx.legacy:legacy-support-v4:1.0.0")
149150
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
150151
implementation("androidx.recyclerview:recyclerview:1.2.1")
@@ -172,9 +173,9 @@ dependencies {
172173

173174
// room
174175
// https://developer.android.com/topic/libraries/architecture/room
175-
implementation("androidx.room:room-runtime:2.4.3")
176-
kapt("androidx.room:room-compiler:2.4.3")
177-
implementation("androidx.room:room-ktx:2.4.3")
176+
implementation("androidx.room:room-runtime:2.5.0")
177+
kapt("androidx.room:room-compiler:2.5.0")
178+
implementation("androidx.room:room-ktx:2.5.0")
178179

179180
// paging
180181
// https://developer.android.com/topic/libraries/architecture/paging
@@ -247,12 +248,12 @@ dependencies {
247248

248249
// unit test
249250
testImplementation("junit:junit:4.13.2")
250-
testImplementation("org.mockito:mockito-core:4.9.0")
251+
testImplementation("org.mockito:mockito-core:5.0.0")
251252
// testImplementation("org.mockito:mockito-inline:3.3.3")
252253
testImplementation("io.mockk:mockk:1.13.3")
253254
testImplementation("androidx.arch.core:core-testing:2.1.0")
254255
testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.2")
255-
testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.20")
256+
testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0")
256257
// testImplementation("org.robolectric:robolectric:4.3")
257258

258259
/**
@@ -372,9 +373,8 @@ dependencies {
372373
// compose
373374
// https://developer.android.com/jetpack/compose/interop/adding
374375
// https://developer.android.com/jetpack/compose/setup
375-
val composeBom = platform("androidx.compose:compose-bom:2022.12.00")
376-
implementation(composeBom)
377-
androidTestImplementation(composeBom)
376+
implementation("androidx.compose:compose-bom:2023.01.00")
377+
androidTestImplementation("androidx.compose:compose-bom:2023.01.00")
378378
// Android Studio Preview support
379379
implementation("androidx.compose.ui:ui-tooling-preview")
380380
debugImplementation("androidx.compose.ui:ui-tooling")
@@ -409,7 +409,7 @@ dependencies {
409409
implementation("androidx.navigation:navigation-compose:2.5.3")
410410
implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
411411
// https://github.com/skydoves/landscapist
412-
implementation("com.github.skydoves:landscapist-bom:2.1.0")
412+
implementation("com.github.skydoves:landscapist-bom:2.1.1")
413413
implementation("com.github.skydoves:landscapist-glide")
414414
implementation("com.github.skydoves:landscapist-placeholder")
415415
// https://google.github.io/accompanist/

app/src/main/java/com/example/moviedb/data/local/dao/MovieDao.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package com.example.moviedb.data.local.dao
22

3-
import androidx.room.Dao
4-
import androidx.room.Delete
5-
import androidx.room.Insert
6-
import androidx.room.OnConflictStrategy.IGNORE
7-
import androidx.room.OnConflictStrategy.REPLACE
8-
import androidx.room.Query
3+
import androidx.room.*
94
import com.example.moviedb.data.model.Movie
105

116
@Dao
@@ -16,13 +11,13 @@ interface MovieDao {
1611
@Query("SELECT * FROM movie WHERE movie.id = :id")
1712
suspend fun getMovie(id: String): Movie?
1813

19-
@Insert(onConflict = IGNORE)
14+
@Insert(onConflict = OnConflictStrategy.REPLACE)
2015
suspend fun insert(movie: Movie)
2116

22-
@Insert(onConflict = IGNORE)
17+
@Insert(onConflict = OnConflictStrategy.REPLACE)
2318
suspend fun insert(list: List<Movie>)
2419

25-
@Insert(onConflict = REPLACE)
20+
@Insert(onConflict = OnConflictStrategy.REPLACE)
2621
suspend fun update(movie: Movie)
2722

2823
@Delete

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath("com.android.tools.build:gradle:7.3.1")
7+
classpath("com.android.tools.build:gradle:7.4.0")
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
99
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
1010
classpath("com.google.dagger:hilt-android-gradle-plugin:2.44")

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

0 commit comments

Comments
 (0)