Move SupportSQLite* feature classes in room-runtime to their own package
This helps us organize features available with SupportSQLite* vs those not available with driver APIs.
Test: Existing
Change-Id: Id729ec5144297a833e8ba816339236de2c5978b5
diff --git a/room/room-runtime/lint-baseline.xml b/room/room-runtime/lint-baseline.xml
index bcfeb52..5a234f8 100644
--- a/room/room-runtime/lint-baseline.xml
+++ b/room/room-runtime/lint-baseline.xml
@@ -7,7 +7,7 @@
errorLine1=" SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -16,7 +16,7 @@
errorLine1=" SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
errorLine2=" ~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -25,7 +25,7 @@
errorLine1=" SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
errorLine2=" ~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -34,7 +34,7 @@
errorLine1=" SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
errorLine2=" ~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -43,7 +43,7 @@
errorLine1=" return SupportSQLiteCompat.Api29Impl.getNotificationUris(delegate)"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -52,7 +52,7 @@
errorLine1=" return SupportSQLiteCompat.Api29Impl.getNotificationUris(delegate)"
errorLine2=" ~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -61,7 +61,7 @@
errorLine1=" SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
errorLine2=" ~~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -70,7 +70,7 @@
errorLine1=" SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
errorLine2=" ~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -79,7 +79,7 @@
errorLine1=" SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
errorLine2=" ~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt"/>
</issue>
<issue
@@ -88,7 +88,7 @@
errorLine1=" val copyLock = ProcessLock("
errorLine2=" ~~~~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
</issue>
<issue
@@ -97,7 +97,7 @@
errorLine1=" name,"
errorLine2=" ~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
</issue>
<issue
@@ -106,7 +106,7 @@
errorLine1=" context.filesDir,"
errorLine2=" ~~~~~~~~~~~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
</issue>
<issue
@@ -115,7 +115,7 @@
errorLine1=" copyLock.lock()"
errorLine2=" ~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
</issue>
<issue
@@ -124,7 +124,7 @@
errorLine1=" copyLock.unlock()"
errorLine2=" ~~~~~~">
<location
- file="src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt"/>
+ file="src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt"/>
</issue>
</issues>
diff --git a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/MultiInstanceInvalidationTest.kt b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/MultiInstanceInvalidationTest.kt
index 36c22ac..6374434 100644
--- a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/MultiInstanceInvalidationTest.kt
+++ b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/MultiInstanceInvalidationTest.kt
@@ -20,6 +20,7 @@
import android.content.Context
import android.os.Build
import androidx.kruth.assertThat
+import androidx.room.support.AutoClosingRoomOpenHelper
import androidx.test.core.app.ApplicationProvider
import androidx.test.filters.SdkSuppress
import java.util.concurrent.CountDownLatch
diff --git a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoCloserTest.kt b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoCloserTest.kt
similarity index 99%
rename from room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoCloserTest.kt
rename to room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoCloserTest.kt
index 1513ee6..9be2a51 100644
--- a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoCloserTest.kt
+++ b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoCloserTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.annotation.SuppressLint
import androidx.arch.core.executor.ArchTaskExecutor
diff --git a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactoryTest.kt
similarity index 99%
rename from room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt
rename to room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactoryTest.kt
index 93a3f73..2b3b186 100644
--- a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperFactoryTest.kt
+++ b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactoryTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.annotation.SuppressLint
import android.content.Context
diff --git a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperTest.kt b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperTest.kt
similarity index 99%
rename from room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperTest.kt
rename to room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperTest.kt
index 8621c189..3e26d9b 100644
--- a/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/AutoClosingRoomOpenHelperTest.kt
+++ b/room/room-runtime/src/androidInstrumentedTest/kotlin/androidx/room/support/AutoClosingRoomOpenHelperTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.annotation.SuppressLint
import android.content.Context
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/InvalidationTracker.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/InvalidationTracker.android.kt
index 4c24f6c..39464f9 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/InvalidationTracker.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/InvalidationTracker.android.kt
@@ -27,6 +27,7 @@
import androidx.lifecycle.LiveData
import androidx.room.Room.LOG_TAG
import androidx.room.driver.SupportSQLiteConnection
+import androidx.room.support.AutoCloser
import androidx.room.util.useCursor
import androidx.sqlite.SQLiteConnection
import androidx.sqlite.db.SimpleSQLiteQuery
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/RoomDatabase.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/RoomDatabase.android.kt
index 450ae01..4577958 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/RoomDatabase.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/RoomDatabase.android.kt
@@ -35,6 +35,12 @@
import androidx.room.driver.SupportSQLiteConnection
import androidx.room.migration.AutoMigrationSpec
import androidx.room.migration.Migration
+import androidx.room.support.AutoCloser
+import androidx.room.support.AutoClosingRoomOpenHelper
+import androidx.room.support.AutoClosingRoomOpenHelperFactory
+import androidx.room.support.PrePackagedCopyOpenHelper
+import androidx.room.support.PrePackagedCopyOpenHelperFactory
+import androidx.room.support.QueryInterceptorOpenHelperFactory
import androidx.room.util.contains as containsExt
import androidx.room.util.findMigrationPath as findMigrationPathExt
import androidx.sqlite.SQLiteConnection
@@ -230,7 +236,7 @@
// Configure SQLiteCopyOpenHelper if it is available
unwrapOpenHelper(
- clazz = SQLiteCopyOpenHelper::class.java,
+ clazz = PrePackagedCopyOpenHelper::class.java,
openHelper = connectionManager.supportOpenHelper
)?.setDatabaseConfiguration(configuration)
@@ -1631,7 +1637,7 @@
"Builder, but the database can only be created using one of the " +
"three configurations."
}
- SQLiteCopyOpenHelperFactory(
+ PrePackagedCopyOpenHelperFactory(
copyFromAssetPath,
copyFromFile,
copyFromInputStream,
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoCloser.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoCloser.android.kt
similarity index 98%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/AutoCloser.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoCloser.android.kt
index 885f035..3ff8ac4 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoCloser.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoCloser.android.kt
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.os.Handler
import android.os.Looper
import android.os.SystemClock
import androidx.annotation.GuardedBy
-import androidx.annotation.VisibleForTesting
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import java.io.IOException
@@ -204,7 +203,6 @@
*
* @return current ref count
*/
- @get:VisibleForTesting
internal val refCountForTest: Int
get() {
synchronized(lock) { return refCount }
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt
similarity index 99%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt
index 2d29e36..dcd71f6 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelper.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelper.android.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.content.ContentResolver
import android.content.ContentValues
@@ -26,6 +26,7 @@
import android.os.CancellationSignal
import android.util.Pair
import androidx.annotation.RequiresApi
+import androidx.room.DelegatingOpenHelper
import androidx.sqlite.db.SupportSQLiteCompat
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelperFactory.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactory.android.kt
similarity index 97%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelperFactory.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactory.android.kt
index 59ee286..1103b8a 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/AutoClosingRoomOpenHelperFactory.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/AutoClosingRoomOpenHelperFactory.android.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import androidx.sqlite.db.SupportSQLiteOpenHelper
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt
similarity index 97%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt
index 883fe26..d174d2a 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelper.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelper.android.kt
@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.content.Context
import android.util.Log
+import androidx.room.DatabaseConfiguration
+import androidx.room.DelegatingOpenHelper
import androidx.room.Room.LOG_TAG
import androidx.room.util.copy
import androidx.room.util.readVersion
@@ -38,7 +40,7 @@
* storage.
*/
@Suppress("BanSynchronizedMethods")
-internal class SQLiteCopyOpenHelper(
+internal class PrePackagedCopyOpenHelper(
private val context: Context,
private val copyFromAssetPath: String?,
private val copyFromFile: File?,
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelperFactory.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelperFactory.android.kt
similarity index 89%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelperFactory.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelperFactory.android.kt
index 9ecb35b..e06f99c 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/SQLiteCopyOpenHelperFactory.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/PrePackagedCopyOpenHelperFactory.android.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import androidx.sqlite.db.SupportSQLiteOpenHelper
import java.io.File
@@ -22,9 +22,9 @@
/**
* Implementation of [SupportSQLiteOpenHelper.Factory] that creates
- * [SQLiteCopyOpenHelper].
+ * [PrePackagedCopyOpenHelper].
*/
-internal class SQLiteCopyOpenHelperFactory(
+internal class PrePackagedCopyOpenHelperFactory(
private val mCopyFromAssetPath: String?,
private val mCopyFromFile: File?,
private val mCopyFromInputStream: Callable<InputStream>?,
@@ -33,7 +33,7 @@
override fun create(
configuration: SupportSQLiteOpenHelper.Configuration
): SupportSQLiteOpenHelper {
- return SQLiteCopyOpenHelper(
+ return PrePackagedCopyOpenHelper(
configuration.context,
mCopyFromAssetPath,
mCopyFromFile,
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorDatabase.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorDatabase.android.kt
similarity index 98%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorDatabase.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorDatabase.android.kt
index 0f1ec17..8d34df5 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorDatabase.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorDatabase.android.kt
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.database.Cursor
import android.database.sqlite.SQLiteTransactionListener
import android.os.CancellationSignal
+import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteQuery
import androidx.sqlite.db.SupportSQLiteStatement
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelper.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelper.android.kt
similarity index 92%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelper.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelper.android.kt
index c15672f..9405ae6 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelper.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelper.android.kt
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
+import androidx.room.DelegatingOpenHelper
+import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import java.util.concurrent.Executor
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelperFactory.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelperFactory.android.kt
similarity index 95%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelperFactory.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelperFactory.android.kt
index 1d86465..e704e6b 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorOpenHelperFactory.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorOpenHelperFactory.android.kt
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
+import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import java.util.concurrent.Executor
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorProgram.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorProgram.android.kt
similarity index 98%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorProgram.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorProgram.android.kt
index 49aea34..3d841dfc5 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorProgram.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorProgram.android.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import androidx.sqlite.db.SupportSQLiteProgram
diff --git a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorStatement.android.kt b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorStatement.android.kt
similarity index 97%
rename from room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorStatement.android.kt
rename to room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorStatement.android.kt
index 37eca34..5980fee 100644
--- a/room/room-runtime/src/androidMain/kotlin/androidx/room/QueryInterceptorStatement.android.kt
+++ b/room/room-runtime/src/androidMain/kotlin/androidx/room/support/QueryInterceptorStatement.android.kt
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
+import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteStatement
import java.util.concurrent.Executor
diff --git a/room/room-runtime/src/androidUnitTest/kotlin/androidx/room/SQLiteCopyOpenHelperTest.kt b/room/room-runtime/src/androidUnitTest/kotlin/androidx/room/support/PrePackagedCopyOpenHelperTest.kt
similarity index 96%
rename from room/room-runtime/src/androidUnitTest/kotlin/androidx/room/SQLiteCopyOpenHelperTest.kt
rename to room/room-runtime/src/androidUnitTest/kotlin/androidx/room/support/PrePackagedCopyOpenHelperTest.kt
index 2e4fba7..3757aab 100644
--- a/room/room-runtime/src/androidUnitTest/kotlin/androidx/room/SQLiteCopyOpenHelperTest.kt
+++ b/room/room-runtime/src/androidUnitTest/kotlin/androidx/room/support/PrePackagedCopyOpenHelperTest.kt
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package androidx.room
+package androidx.room.support
import android.annotation.SuppressLint
import android.content.Context
import android.content.res.AssetManager
import android.os.Build
import androidx.annotation.RequiresApi
+import androidx.room.DatabaseConfiguration
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import java.io.File
@@ -48,7 +49,7 @@
import org.mockito.Mockito.`when`
@RunWith(JUnit4::class)
-class SQLiteCopyOpenHelperTest {
+class PrePackagedCopyOpenHelperTest {
companion object {
const val DB_NAME = "test.db"
@@ -222,7 +223,7 @@
}
internal fun createOpenHelper(copyFromAssetFile: File) =
- SQLiteCopyOpenHelper(
+ PrePackagedCopyOpenHelper(
context,
copyFromAssetFile.name,
null,
@@ -282,7 +283,8 @@
fun main(args: Array<String>) {
val tmpDir = File(args[0])
val copyFromFile = File(args[1])
- val openHelper = SQLiteCopyOpenHelperTest().apply { setupMocks(tmpDir, copyFromFile) }
+ val openHelper = PrePackagedCopyOpenHelperTest()
+ .apply { setupMocks(tmpDir, copyFromFile) }
.createOpenHelper(copyFromFile)
openHelper.writableDatabase
}
