Merge branch 'gedoor:master' into master
This commit is contained in:
+5
-8
@@ -1,6 +1,7 @@
|
||||
plugins {
|
||||
id "com.android.application"
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
id 'com.google.devtools.ksp'
|
||||
id 'kotlin-parcelize'
|
||||
id 'kotlin-kapt'
|
||||
id "de.timfreiheit.resourceplaceholders"
|
||||
@@ -57,6 +58,9 @@ android {
|
||||
]
|
||||
}
|
||||
}
|
||||
ksp {
|
||||
arg("room.schemaLocation", "$projectDir/schemas")
|
||||
}
|
||||
}
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
@@ -129,12 +133,6 @@ resourcePlaceholders {
|
||||
files = ['xml/shortcuts.xml']
|
||||
}
|
||||
|
||||
kapt {
|
||||
arguments {
|
||||
arg("room.schemaLocation", "$projectDir/schemas")
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
//noinspection GradleDependency
|
||||
coreLibraryDesugaring('com.android.tools:desugar_jdk_libs:1.1.6')
|
||||
@@ -204,8 +202,7 @@ dependencies {
|
||||
//room
|
||||
implementation("androidx.room:room-runtime:$room_version")
|
||||
implementation("androidx.room:room-ktx:$room_version")
|
||||
kapt("androidx.room:room-compiler:$room_version")
|
||||
//ksp("androidx.room:room-compiler:$room_version")
|
||||
ksp("androidx.room:room-compiler:$room_version")
|
||||
testImplementation("androidx.room:room-testing:$room_version")
|
||||
|
||||
//liveEventBus
|
||||
|
||||
Reference in New Issue
Block a user