A fully functional Android app built entirely with Kotlin and Jetpack Compose
Replace custom `RoomSchemaArgProvider` in favor of the new Room Gradle plugin
Simon Marquis5f7d4ea1d57c
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex b6650aa75..d9f825294 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -41,6 +41,7 @@ dependencies {compileOnly(libs.firebase.performance.gradlePlugin)compileOnly(libs.kotlin.gradlePlugin)compileOnly(libs.ksp.gradlePlugin)+ compileOnly(libs.room.gradlePlugin)}gradlePlugin {diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.ktindex b67fb1b26..29d31f9e6 100644--- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt@@ -14,29 +14,25 @@* limitations under the License.*/-import com.google.devtools.ksp.gradle.KspExtension+import androidx.room.gradle.RoomExtensionimport com.google.samples.apps.nowinandroid.libsimport org.gradle.api.Pluginimport org.gradle.api.Project-import org.gradle.api.tasks.InputDirectory-import org.gradle.api.tasks.PathSensitive-import org.gradle.api.tasks.PathSensitivityimport org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.dependencies-import org.gradle.process.CommandLineArgumentProvider-import java.io.Fileclass AndroidRoomConventionPlugin : Plugin<Project> {override fun apply(target: Project) {with(target) {+ pluginManager.apply("androidx.room")pluginManager.apply("com.google.devtools.ksp")- extensions.configure<KspExtension> {+ extensions.configure<RoomExtension> {// The schemas directory contains a schema file for each version of the Room database.// This is required to enable Room auto migrations.// See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.- arg(RoomSchemaArgProvider(File(projectDir, "schemas")))+ schemaDirectory("$projectDir/schemas")}dependencies {@@ -46,16 +42,4 @@ class AndroidRoomConventionPlugin : Plugin<Project> {}}}-- /**- * https://issuetracker.google.com/issues/132245929- * [Export schemas](https://developer.android.com/training/data-storage/room/migrating-db-versions#export-schemas)- */- class RoomSchemaArgProvider(- @get:InputDirectory- @get:PathSensitive(PathSensitivity.RELATIVE)- val schemaDir: File,- ) : CommandLineArgumentProvider {- override fun asArguments() = listOf("room.schemaLocation=${schemaDir.path}")- }}\ No newline at end of filediff --git a/build.gradle.kts b/build.gradle.ktsindex 7b54f9058..d6c076b06 100644--- a/build.gradle.kts+++ b/build.gradle.kts@@ -43,4 +43,5 @@ plugins {alias(libs.plugins.ksp) apply falsealias(libs.plugins.roborazzi) apply falsealias(libs.plugins.secrets) apply false+ alias(libs.plugins.room) apply false}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 1eb9116e8..dc08a2fef 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -148,6 +148,7 @@ firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firfirebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }+room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }work-testing = { group = "androidx.work", name = "work-testing", version = "2.8.1" }[plugins]@@ -164,6 +165,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versiksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }+room = { id = "androidx.room", version.ref = "room" }secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }# Plugins defined by this project