room plugin test

mikescamell · mikescamell · commit 42e730ca99b7 · 2025-07-22T18:13:14.000+02:00
diff --git a/app-tracking-protection/vpn-store/build.gradle b/app-tracking-protection/vpn-store/build.gradle
@@ -18,18 +18,12 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
 
 android {
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
@@ -43,6 +37,10 @@ android {
     compileOptions {
         coreLibraryDesugaringEnabled = true
     }
+
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 dependencies {
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-
+    id 'androidx.room'
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'com.google.devtools.ksp'
@@ -26,11 +26,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         archivesBaseName = "duckduckgo-$versionName"
         vectorDrawables.useSupportLibrary = true
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
         sourceSets {
             androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
             main {
@@ -183,6 +178,9 @@ android {
             jvmArgs '-XX:+TieredCompilation', '-XX:TieredStopAtLevel=1'
         }
     }
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 static def isValidSigningConfig(signingConfig) {
diff --git a/autofill/autofill-impl/build.gradle b/autofill/autofill-impl/build.gradle
@@ -20,6 +20,7 @@ plugins {
     id 'com.squareup.anvil'
     id 'kotlin-parcelize'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -133,10 +134,9 @@ android {
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
-}
-
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 tasks.register('installForAutofillTesting', Exec) {
diff --git a/broken-site/broken-site-store/build.gradle b/broken-site/broken-site-store/build.gradle
@@ -18,6 +18,7 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -40,18 +41,14 @@ dependencies {
     coreLibraryDesugaring Android.tools.desugarJdkLibs
 }
 android {
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
     namespace 'com.duckduckgo.brokensite.store'
     compileOptions {
         coreLibraryDesugaringEnabled = true
     }
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,7 @@ buildscript {
 }
 
 plugins {
+    id 'androidx.room' apply false
     id 'com.squareup.anvil' apply false
     id 'org.jetbrains.dokka'
     id 'com.osacky.fulladle'
diff --git a/experiments/experiments-impl/build.gradle b/experiments/experiments-impl/build.gradle
@@ -19,6 +19,7 @@ plugins {
     id 'kotlin-android'
     id 'com.squareup.anvil'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -92,19 +93,15 @@ android {
             includeAndroidResources = true
         }
     }
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
     compileOptions {
         coreLibraryDesugaringEnabled = true
     }
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
     namespace 'com.duckduckgo.experiments.impl'
 }
 
diff --git a/pir/pir-internal/build.gradle b/pir/pir-internal/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'com.squareup.anvil'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -16,8 +17,8 @@ android {
         generateDaggerFactories = true // default is false
     }
     namespace 'com.duckduckgo.pir.internal'
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
+    room {
+        schemaDirectory "$projectDir/schemas"
     }
 }
 
diff --git a/remote-messaging/remote-messaging-store/build.gradle b/remote-messaging/remote-messaging-store/build.gradle
@@ -18,18 +18,12 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
 
 android {
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
@@ -42,6 +36,9 @@ android {
             includeAndroidResources = true
         }
     }
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,11 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
 plugins {
     id("de.fayard.refreshVersions") version "0.60.5"
 }
diff --git a/site-permissions/site-permissions-store/build.gradle b/site-permissions/site-permissions-store/build.gradle
@@ -18,6 +18,7 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -27,20 +28,16 @@ android {
         baseline file("lint-baseline.xml")
         abortOnError = !project.hasProperty("abortOnError") || project.property("abortOnError") != "false"
     }
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
     namespace 'com.duckduckgo.site.permissions.store'
     compileOptions {
         coreLibraryDesugaringEnabled = true
     }
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 dependencies {
diff --git a/versions.properties b/versions.properties
@@ -9,6 +9,8 @@
 
 plugin.android=8.11.1
 
+plugin.androidx.room=2.7.2
+
 plugin.com.squareup.anvil=2.6.1
 
 plugin.org.jetbrains.dokka=1.8.20
diff --git a/voice-search/voice-search-store/build.gradle b/voice-search/voice-search-store/build.gradle
@@ -18,6 +18,7 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'androidx.room'
 }
 
 apply from: "$rootProject.projectDir/gradle/android-library.gradle"
@@ -41,15 +42,12 @@ android {
         baseline file("lint-baseline.xml")
         abortOnError = !project.hasProperty("abortOnError") || project.property("abortOnError") != "false"
     }
-    defaultConfig {
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
-    }
     sourceSets {
         test.assets.srcDirs += files("$projectDir/schemas".toString())
     }
   namespace 'com.duckduckgo.voice.store'
+
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ plugins {`
`20`	`20`	`id 'com.squareup.anvil'`
`21`	`21`	`id 'kotlin-parcelize'`
`22`	`22`	`id 'com.google.devtools.ksp'`
	`23`	`+ id 'androidx.room'`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`apply from: "$rootProject.projectDir/gradle/android-library.gradle"`
`@@ -133,10 +134,9 @@ android {`
`133`	`134`	`sourceSets {`
`134`	`135`	`test.assets.srcDirs += files("$projectDir/schemas".toString())`
`135`	`136`	`}`
`136`		`-}`
`137`		`-`
`138`		`-ksp {`
`139`		`- arg("room.schemaLocation", "$projectDir/schemas")`
	`137`	`+ room {`
	`138`	`+ schemaDirectory "$projectDir/schemas"`
	`139`	`+ }`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`tasks.register('installForAutofillTesting', Exec) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ plugins {`
`18`	`18`	`id 'com.android.library'`
`19`	`19`	`id 'kotlin-android'`
`20`	`20`	`id 'com.google.devtools.ksp'`
	`21`	`+ id 'androidx.room'`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`apply from: "$rootProject.projectDir/gradle/android-library.gradle"`
`@@ -40,18 +41,14 @@ dependencies {`
`40`	`41`	`coreLibraryDesugaring Android.tools.desugarJdkLibs`
`41`	`42`	`}`
`42`	`43`	`android {`
`43`		`- defaultConfig {`
`44`		`- javaCompileOptions {`
`45`		`- annotationProcessorOptions {`
`46`		`- arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]`
`47`		`- }`
`48`		`- }`
`49`		`- }`
`50`	`44`	`sourceSets {`
`51`	`45`	`test.assets.srcDirs += files("$projectDir/schemas".toString())`
`52`	`46`	`}`
`53`	`47`	`namespace 'com.duckduckgo.brokensite.store'`
`54`	`48`	`compileOptions {`
`55`	`49`	`coreLibraryDesugaringEnabled = true`
`56`	`50`	`}`
	`51`	`+ room {`
	`52`	`+ schemaDirectory "$projectDir/schemas"`
	`53`	`+ }`
`57`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ buildscript {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`plugins {`
	`31`	`+ id 'androidx.room' apply false`
`31`	`32`	`id 'com.squareup.anvil' apply false`
`32`	`33`	`id 'org.jetbrains.dokka'`
`33`	`34`	`id 'com.osacky.fulladle'`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ plugins {`
`19`	`19`	`id 'kotlin-android'`
`20`	`20`	`id 'com.squareup.anvil'`
`21`	`21`	`id 'com.google.devtools.ksp'`
	`22`	`+ id 'androidx.room'`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`apply from: "$rootProject.projectDir/gradle/android-library.gradle"`
`@@ -92,19 +93,15 @@ android {`
`92`	`93`	`includeAndroidResources = true`
`93`	`94`	`}`
`94`	`95`	`}`
`95`		`- defaultConfig {`
`96`		`- javaCompileOptions {`
`97`		`- annotationProcessorOptions {`
`98`		`- arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]`
`99`		`- }`
`100`		`- }`
`101`		`- }`
`102`	`96`	`sourceSets {`
`103`	`97`	`test.assets.srcDirs += files("$projectDir/schemas".toString())`
`104`	`98`	`}`
`105`	`99`	`compileOptions {`
`106`	`100`	`coreLibraryDesugaringEnabled = true`
`107`	`101`	`}`
	`102`	`+ room {`
	`103`	`+ schemaDirectory "$projectDir/schemas"`
	`104`	`+ }`
`108`	`105`	`namespace 'com.duckduckgo.experiments.impl'`
`109`	`106`	`}`
`110`	`107`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`id 'kotlin-android'`
`4`	`4`	`id 'com.squareup.anvil'`
`5`	`5`	`id 'com.google.devtools.ksp'`
	`6`	`+ id 'androidx.room'`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`apply from: "$rootProject.projectDir/gradle/android-library.gradle"`
`@@ -16,8 +17,8 @@ android {`
`16`	`17`	`generateDaggerFactories = true // default is false`
`17`	`18`	`}`
`18`	`19`	`namespace 'com.duckduckgo.pir.internal'`
`19`		`- ksp {`
`20`		`- arg("room.schemaLocation", "$projectDir/schemas")`
	`20`	`+ room {`
	`21`	`+ schemaDirectory "$projectDir/schemas"`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -18,18 +18,12 @@ plugins {`
`18`	`18`	`id 'com.android.library'`
`19`	`19`	`id 'kotlin-android'`
`20`	`20`	`id 'com.google.devtools.ksp'`
	`21`	`+ id 'androidx.room'`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`apply from: "$rootProject.projectDir/gradle/android-library.gradle"`
`24`	`25`
`25`	`26`	`android {`
`26`		`- defaultConfig {`
`27`		`- javaCompileOptions {`
`28`		`- annotationProcessorOptions {`
`29`		`- arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]`
`30`		`- }`
`31`		`- }`
`32`		`- }`
`33`	`27`	`sourceSets {`
`34`	`28`	`test.assets.srcDirs += files("$projectDir/schemas".toString())`
`35`	`29`	`}`
`@@ -42,6 +36,9 @@ android {`
`42`	`36`	`includeAndroidResources = true`
`43`	`37`	`}`
`44`	`38`	`}`
	`39`	`+ room {`
	`40`	`+ schemaDirectory "$projectDir/schemas"`
	`41`	`+ }`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`dependencies {`