[go: nahoru, domu]

Make room sqlite dependency explicit

Test: ./gradlew room:integration-tests:room-testapp:cC

Change-Id: I96d173aaae8c2d42af966b2a926c03762eefeee9
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle
index 64a32092..4a2a8f5 100644
--- a/room/benchmark/build.gradle
+++ b/room/benchmark/build.gradle
@@ -29,8 +29,6 @@
     // depend on the shadowed version so that it tests with the shipped artifact
     kaptAndroidTest project(path: ":room:room-compiler", configuration: 'shadowAndImplementation')
     androidTestImplementation(project(":room:room-rxjava2"))
-    androidTestImplementation(project(":sqlite:sqlite"))
-    androidTestImplementation(project(":sqlite:sqlite-framework"))
     androidTestImplementation("androidx.arch.core:core-runtime:2.0.1")
     androidTestImplementation(project(":benchmark:benchmark-junit4"))
     androidTestImplementation(RX_JAVA)
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle
index d1608cf..e08c5e8 100644
--- a/room/integration-tests/autovaluetestapp/build.gradle
+++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -30,8 +30,6 @@
 
 dependencies {
     implementation(project(":room:room-common"))
-    implementation(project(":sqlite:sqlite"))
-    implementation(project(":sqlite:sqlite-framework"))
     implementation(project(":room:room-runtime"))
     implementation(project(":arch:core-runtime"))
 
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index bce18c2..bd48123 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -75,8 +75,6 @@
 
 dependencies {
     implementation(project(":room:room-common"))
-    implementation(project(":sqlite:sqlite"))
-    implementation(project(":sqlite:sqlite-framework"))
     implementation(project(":room:room-runtime"))
     implementation(project(":arch:core-runtime"))
     implementation(project(":lifecycle:lifecycle-livedata"))
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index ceee998..cd84990 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -74,8 +74,6 @@
 dependencies {
     implementation(project(":room:room-common"))
     implementation(project(":room:room-runtime"))
-    implementation(project(":sqlite:sqlite"))
-    implementation(project(":sqlite:sqlite-framework"))
     implementation(project(":arch:core-runtime"))
     implementation(project(":lifecycle:lifecycle-livedata"))
     implementation(MULTIDEX)
diff --git a/room/runtime/build.gradle b/room/runtime/build.gradle
index 67aa153..93a6751 100644
--- a/room/runtime/build.gradle
+++ b/room/runtime/build.gradle
@@ -34,8 +34,8 @@
 
 dependencies {
     api(project(":room:room-common"))
-    api(project(":sqlite:sqlite-framework"))
-    api(project(":sqlite:sqlite"))
+    api("androidx.sqlite:sqlite-framework:2.1.0")
+    api("androidx.sqlite:sqlite:2.1.0")
     implementation("androidx.arch.core:core-runtime:2.0.1")
     compileOnly(project(":paging:paging-common"))
     compileOnly("androidx.lifecycle:lifecycle-livedata-core:2.0.0")