Skip to content

Commit 523b599

Browse files
committed
Update libs
1 parent 3b049fa commit 523b599

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
buildToolsVersion = "31.0.0"
2222
minSdk = 23
2323
compileSdk = 31
24-
targetSdk = 31
24+
targetSdk = 32
2525
multiDexEnabled = true
2626
vectorDrawables {
2727
useSupportLibrary = true
@@ -139,9 +139,9 @@ dependencies {
139139
implementation("androidx.legacy:legacy-support-v4:1.0.0")
140140
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
141141
implementation("androidx.recyclerview:recyclerview:1.2.1")
142-
implementation("com.google.android.material:material:1.5.0")
143-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10")
144-
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
142+
implementation("com.google.android.material:material:1.6.0")
143+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
144+
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
145145
implementation("androidx.multidex:multidex:2.0.1")
146146

147147
// List of KTX extensions
@@ -173,9 +173,9 @@ dependencies {
173173

174174
// navigation
175175
// https://developer.android.com/jetpack/androidx/releases/navigation
176-
implementation("androidx.navigation:navigation-runtime-ktx:2.3.5")
177-
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
178-
implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
176+
implementation("androidx.navigation:navigation-runtime-ktx:2.4.2")
177+
implementation("androidx.navigation:navigation-fragment-ktx:2.4.2")
178+
implementation("androidx.navigation:navigation-ui-ktx:2.4.2")
179179

180180
// coroutines
181181
// https://github.com/Kotlin/kotlinx.coroutines
@@ -184,8 +184,8 @@ dependencies {
184184
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
185185

186186
// moshi
187-
implementation("com.squareup.moshi:moshi-kotlin:1.12.0")
188-
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.12.0")
187+
implementation("com.squareup.moshi:moshi-kotlin:1.13.0")
188+
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0")
189189

190190
// retrofit
191191
// https://github.com/square/retrofit
@@ -219,7 +219,7 @@ dependencies {
219219

220220
// firebase
221221
// https://firebase.google.com/docs/android/setup
222-
implementation("com.google.firebase:firebase-analytics:20.1.2")
222+
implementation("com.google.firebase:firebase-analytics:21.0.0")
223223
implementation("com.google.firebase:firebase-crashlytics:18.2.10")
224224

225225
// lottie
@@ -441,8 +441,8 @@ project.afterEvaluate {
441441
//execute file .exec to generate data report
442442
executionData.setFrom(files("${project.buildDir}/jacoco/${testTaskName}.exec"))
443443
reports {
444-
xml.isEnabled = true
445-
html.isEnabled = true
444+
xml.required.set(true)
445+
html.required.set(true)
446446
}
447447
dependsOn(testTaskName)
448448
}

app/src/main/java/com/example/moviedb/ui/screen/image/ImageFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ImageFragment : BaseFragment<FragmentImageBinding, BaseViewModel>() {
3535
super.onViewCreated(view, savedInstanceState)
3636
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
3737
sharedElementEnterTransition =
38-
TransitionInflater.from(context).inflateTransition(android.R.transition.move)
38+
TransitionInflater.from(requireContext()).inflateTransition(android.R.transition.move)
3939
}
4040

4141
viewBinding.imageRequestListener = object : RequestListener<Drawable> {

app/src/main/java/com/example/moviedb/ui/widgets/NavigationExtension.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.moviedb.ui.navigation
1+
package com.example.moviedb.ui.widgets
22

33
/*
44
https://github.com/googlesamples/android-architecture-components/blob/master/NavigationAdvancedSample/app/src/main/java/com/example/android/navigationadvancedsample/NavigationExtensions.kt
@@ -7,7 +7,6 @@ https://github.com/googlesamples/android-architecture-components/blob/master/Nav
77
import android.content.Intent
88
import android.util.SparseArray
99
import androidx.core.util.forEach
10-
import androidx.core.util.set
1110
import androidx.fragment.app.FragmentManager
1211
import androidx.lifecycle.LiveData
1312
import androidx.lifecycle.MutableLiveData
@@ -182,7 +181,7 @@ private fun BottomNavigationView.setupItemReselected(
182181
val navController = selectedFragment.navController
183182
// Pop the back stack to the start destination of the current navController graph
184183
navController.popBackStack(
185-
navController.graph.startDestination, false
184+
navController.graph.startDestinationId, false
186185
)
187186
}
188187
}

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath("com.android.tools.build:gradle:7.1.3")
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
9-
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5")
7+
classpath("com.android.tools.build:gradle:7.2.0")
8+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
9+
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2")
1010
classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1")
1111
// classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Libs.kotlinVersion}")
1212
// classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Libs.navigationVersion}")

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.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)