Merge "Switch to using Room 2.2.2." into androidx-master-dev
diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle
index cb9fbee..a13b574 100644
--- a/work/integration-tests/testapp/build.gradle
+++ b/work/integration-tests/testapp/build.gradle
@@ -59,8 +59,8 @@
annotationProcessor(project(":room:room-compiler"))
implementation(project(":room:room-runtime"))
} else {
- annotationProcessor("androidx.room:room-compiler:2.2.1")
- implementation("androidx.room:room-runtime:2.2.1")
+ annotationProcessor("androidx.room:room-compiler:2.2.2")
+ implementation("androidx.room:room-runtime:2.2.2")
}
implementation(CONSTRAINT_LAYOUT, { transitive = true })
diff --git a/work/workmanager-benchmark/build.gradle b/work/workmanager-benchmark/build.gradle
index dd75018e..8dd3ba4 100644
--- a/work/workmanager-benchmark/build.gradle
+++ b/work/workmanager-benchmark/build.gradle
@@ -32,7 +32,7 @@
dependencies {
androidTestImplementation(project(':work:work-runtime-ktx'))
androidTestImplementation(project(":benchmark:benchmark-junit4"))
- androidTestImplementation("androidx.room:room-runtime:2.2.0")
+ androidTestImplementation("androidx.room:room-runtime:2.2.2")
androidTestImplementation(JUNIT)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/work/workmanager-gcm/build.gradle b/work/workmanager-gcm/build.gradle
index 32cc569..f960dec 100644
--- a/work/workmanager-gcm/build.gradle
+++ b/work/workmanager-gcm/build.gradle
@@ -51,9 +51,9 @@
implementation(project(":room:room-runtime"))
androidTestImplementation(project(":room:room-testing"))
} else {
- annotationProcessor("androidx.room:room-compiler:2.2.0")
- implementation("androidx.room:room-runtime:2.2.0")
- androidTestImplementation("androidx.room:room-testing:2.2.0")
+ annotationProcessor("androidx.room:room-compiler:2.2.2")
+ implementation("androidx.room:room-runtime:2.2.2")
+ androidTestImplementation("androidx.room:room-testing:2.2.2")
}
androidTestImplementation(project(":work:work-runtime-ktx"))
diff --git a/work/workmanager-ktx/build.gradle b/work/workmanager-ktx/build.gradle
index 2a279bb..e515cec 100644
--- a/work/workmanager-ktx/build.gradle
+++ b/work/workmanager-ktx/build.gradle
@@ -53,7 +53,7 @@
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has its own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation("androidx.room:room-testing:2.2.1")
+ androidTestImplementation("androidx.room:room-testing:2.2.2")
testImplementation(JUNIT)
}
diff --git a/work/workmanager-testing/build.gradle b/work/workmanager-testing/build.gradle
index 281b68b..18bbac6 100644
--- a/work/workmanager-testing/build.gradle
+++ b/work/workmanager-testing/build.gradle
@@ -38,7 +38,7 @@
dependencies {
implementation(project(':work:work-runtime-ktx'))
implementation("androidx.lifecycle:lifecycle-livedata-core:2.1.0")
- implementation("androidx.room:room-runtime:2.2.1")
+ implementation("androidx.room:room-runtime:2.2.2")
androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/work/workmanager/build.gradle b/work/workmanager/build.gradle
index 0ac1cd7..5d16029 100644
--- a/work/workmanager/build.gradle
+++ b/work/workmanager/build.gradle
@@ -62,9 +62,9 @@
}
dependencies {
- annotationProcessor("androidx.room:room-compiler:2.2.1")
- implementation("androidx.room:room-runtime:2.2.1")
- androidTestImplementation("androidx.room:room-testing:2.2.1")
+ annotationProcessor("androidx.room:room-compiler:2.2.2")
+ implementation("androidx.room:room-runtime:2.2.2")
+ androidTestImplementation("androidx.room:room-testing:2.2.2")
api(GUAVA_LISTENABLE_FUTURE)
api("androidx.lifecycle:lifecycle-livedata:2.1.0")
implementation("androidx.core:core:1.1.0")