Merge branch 'master' into jetpack_compose

This commit is contained in:
Yogesh Choudhary Paliyal
2021-11-13 18:24:09 +05:30
committed by GitHub
2 changed files with 6 additions and 7 deletions

View File

@@ -78,7 +78,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.31"
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.5.0-alpha05'
implementation 'com.google.android.material:material:1.5.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.preference:preference-ktx:1.1.1'
@@ -108,12 +108,11 @@ dependencies {
implementation "androidx.room:room-ktx:$room_version"
implementation 'com.yogeshpaliyal:universal-adapter:1.0.0'
implementation 'com.yogeshpaliyal:universal-adapter:3.0.0'
implementation "androidx.biometric:biometric:1.1.0"
// dependency injection
implementation("com.google.dagger:hilt-android:$hilt_version")
kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
@@ -128,12 +127,12 @@ dependencies {
// For instrumented tests.
androidTestImplementation("com.google.dagger:hilt-android-testing:2.38.1")
androidTestImplementation("com.google.dagger:hilt-android-testing:2.40.1")
// ...with Kotlin.
kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.40")
// For Robolectric tests.
testImplementation("com.google.dagger:hilt-android-testing:2.38.1")
testImplementation("com.google.dagger:hilt-android-testing:2.40.1")
// ...with Kotlin.
kaptTest("com.google.dagger:hilt-android-compiler:2.40")

View File

@@ -15,7 +15,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
@@ -29,7 +29,7 @@ buildscript {
}
}
plugins {
id 'com.diffplug.spotless' version '5.10.2'
id 'com.diffplug.spotless' version '6.0.0'
}
allprojects {