Updated dependencies and disabled transitive R classes

This commit is contained in:
Om Godse 2023-05-28 16:28:14 +05:30
parent c8b3739ef0
commit 8c862bc9a7
6 changed files with 16 additions and 12 deletions

View file

@ -46,15 +46,19 @@ android {
} }
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jvmTarget = "1.8"
}
dependencies { dependencies {
final def navVersion = "2.3.5" final def navVersion = "2.3.5"
final def roomVersion = "2.5.0" final def roomVersion = "2.5.1"
kapt "androidx.room:room-compiler:$roomVersion" kapt "androidx.room:room-compiler:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion" implementation "androidx.room:room-ktx:$roomVersion"
implementation "androidx.room:room-runtime:$roomVersion" implementation "androidx.room:room-runtime:$roomVersion"
implementation "androidx.work:work-runtime:2.8.0" implementation "androidx.work:work-runtime:2.8.1"
implementation "androidx.navigation:navigation-ui-ktx:$navVersion" implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
implementation "androidx.navigation:navigation-fragment-ktx:$navVersion" implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"

View file

@ -73,10 +73,10 @@ class MainActivity : AppCompatActivity() {
val options = navOptions { val options = navOptions {
launchSingleTop = true launchSingleTop = true
anim { anim {
exit = R.anim.nav_default_exit_anim exit = androidx.navigation.ui.R.anim.nav_default_exit_anim
enter = R.anim.nav_default_enter_anim enter = androidx.navigation.ui.R.anim.nav_default_enter_anim
popExit = R.anim.nav_default_pop_exit_anim popExit = androidx.navigation.ui.R.anim.nav_default_pop_exit_anim
popEnter = R.anim.nav_default_pop_enter_anim popEnter = androidx.navigation.ui.R.anim.nav_default_pop_enter_anim
} }
popUpTo(navController.graph.startDestination) { inclusive = false } popUpTo(navController.graph.startDestination) { inclusive = false }
} }

View file

@ -37,7 +37,7 @@ class Notes : NotallyFragment() {
val drawable = MaterialShapeDrawable() val drawable = MaterialShapeDrawable()
val surface = TypedValue() val surface = TypedValue()
requireContext().theme.resolveAttribute(R.attr.colorSurface, surface, true) requireContext().theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, surface, true)
drawable.elevation = container.elevation drawable.elevation = container.elevation
drawable.initializeElevationOverlay(requireContext()) drawable.initializeElevationOverlay(requireContext())

View file

@ -6,8 +6,8 @@ buildscript {
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:7.4.1" classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
} }
} }

View file

@ -4,7 +4,6 @@
# any settings specified in this file. # any settings specified in this file.
# For more details on how to configure your build environment visit # For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
android.enableR8.fullMode=true
# AndroidX package structure to make it clearer which packages are bundled with the # AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK # Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn # https://developer.android.com/topic/libraries/support-library/androidx-rn
@ -19,4 +18,5 @@ org.gradle.jvmargs=-Xmx1536m -XX:+UseParallelGC
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true org.gradle.parallel=true
android.experimental.enableNewResourceShrinker.preciseShrinking=true android.experimental.enableNewResourceShrinker.preciseShrinking=true
android.defaults.buildfeatures.buildconfig=true

View file

@ -1,6 +1,6 @@
#Sat Feb 06 22:56:10 IST 2021 #Sat Feb 06 22:56:10 IST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists