Merge pull request #2710 from cashapp/jw/app-cash/2021-11-30

Move runtime types into app.cash package

drivers/android-driver/src/main/java/com/squareup/sqldelight/android/AndroidSqliteDriver.kt

@@ -9,15 +9,15 @@ import androidx.sqlite.db.SupportSQLiteProgram
 import androidx.sqlite.db.SupportSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteStatement
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.db.AfterVersion
-import com.squareup.sqldelight.db.AfterVersionWithDriver
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlPreparedStatement
-import com.squareup.sqldelight.db.migrateWithCallbacks
-import com.squareup.sqldelight.db.toAfterVersionWithDriver
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.db.AfterVersion
+import app.cash.sqldelight.db.AfterVersionWithDriver
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.db.migrateWithCallbacks
+import app.cash.sqldelight.db.toAfterVersionWithDriver
 
 private val DEFAULT_CACHE_SIZE = 20
 

drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt

@@ -1,9 +1,9 @@
 package com.squareup.sqldelight.android
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
-import com.squareup.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlPreparedStatement
 import com.squareup.sqldelight.driver.test.DriverTest
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotSame

drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidQueryTest.kt

@@ -1,8 +1,8 @@
 package com.squareup.sqldelight.android
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.squareup.sqldelight.driver.test.QueryTest
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner

drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidTransacterTest.kt

@@ -1,11 +1,11 @@
 package com.squareup.sqldelight.android
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.TransactionWithReturn
-import com.squareup.sqldelight.TransactionWithoutReturn
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.TransactionWithReturn
+import app.cash.sqldelight.TransactionWithoutReturn
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.squareup.sqldelight.driver.test.TransacterTest
 import org.junit.Assert.assertThrows
 import org.junit.Test

drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt

@@ -1,14 +1,14 @@
 package com.squareup.sqldelight.driver.test
 
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
-import com.squareup.sqldelight.db.SqlPreparedStatement
-import com.squareup.sqldelight.db.use
-import com.squareup.sqldelight.internal.Atomic
-import com.squareup.sqldelight.internal.getValue
-import com.squareup.sqldelight.internal.setValue
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.db.use
+import app.cash.sqldelight.internal.Atomic
+import app.cash.sqldelight.internal.getValue
+import app.cash.sqldelight.internal.setValue
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test

drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/QueryTest.kt

@@ -1,9 +1,9 @@
 package com.squareup.sqldelight.driver.test
 
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.internal.Atomic
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.internal.Atomic
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test

drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/TransacterTest.kt

@@ -1,8 +1,8 @@
 package com.squareup.sqldelight.driver.test
 
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test

drivers/jdbc-driver/src/main/kotlin/com/squareup/sqldelight/sqlite/driver/JdbcDriver.kt

@@ -1,11 +1,11 @@
 @file:JvmName("JdbcDrivers")
 package com.squareup.sqldelight.sqlite.driver
 
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlPreparedStatement
 import com.squareup.sqldelight.sqlite.driver.ConnectionManager.Transaction
 import java.sql.Connection
 import java.sql.PreparedStatement

drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/NativeSqlDatabase.kt

@@ -1,5 +1,11 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.db.Closeable
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlPreparedStatement
 import co.touchlab.sqliter.DatabaseConfiguration
 import co.touchlab.sqliter.DatabaseConnection
 import co.touchlab.sqliter.DatabaseManager
@@ -10,12 +16,6 @@ import co.touchlab.stately.collections.SharedHashMap
 import co.touchlab.stately.collections.SharedSet
 import co.touchlab.stately.concurrency.ThreadLocalRef
 import co.touchlab.stately.concurrency.value
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.db.Closeable
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlPreparedStatement
 import com.squareup.sqldelight.drivers.native.util.nativeCache
 import kotlin.native.concurrent.ensureNeverFrozen
 

drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/Pool.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.Closeable
 import co.touchlab.stately.concurrency.AtomicBoolean
-import com.squareup.sqldelight.db.Closeable
 import com.squareup.sqldelight.drivers.native.util.PoolLock
 import kotlin.native.concurrent.AtomicReference
 import kotlin.native.concurrent.freeze

drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterSqlCursor.kt

@@ -1,11 +1,11 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.SqlCursor
 import co.touchlab.sqliter.Cursor
 import co.touchlab.sqliter.getBytesOrNull
 import co.touchlab.sqliter.getDoubleOrNull
 import co.touchlab.sqliter.getLongOrNull
 import co.touchlab.sqliter.getStringOrNull
-import com.squareup.sqldelight.db.SqlCursor
 
 /**
  * Wrapper for cursor calls. Cursors point to real SQLite statements, so we need to be careful with

drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterStatement.kt

@@ -1,11 +1,11 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.SqlPreparedStatement
 import co.touchlab.sqliter.Statement
 import co.touchlab.sqliter.bindBlob
 import co.touchlab.sqliter.bindDouble
 import co.touchlab.sqliter.bindLong
 import co.touchlab.sqliter.bindString
-import com.squareup.sqldelight.db.SqlPreparedStatement
 
 /**
  * @param [recycle] A function which recycles any resources this statement is backed by.

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt

@@ -1,12 +1,12 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.sqliter.DatabaseConfiguration
 import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
 import co.touchlab.sqliter.DatabaseManager
 import co.touchlab.sqliter.createDatabaseManager
 import co.touchlab.stately.freeze
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlDriver
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
-import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.driver.test.DriverTest
 
 class NativeDriverTest : DriverTest() {

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.sqliter.DatabaseFileContext
-import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.driver.test.QueryTest
 
 class NativeQueryTest : QueryTest() {

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt.ignore

@@ -7,8 +7,8 @@ import co.touchlab.stately.concurrency.AtomicBoolean
 import co.touchlab.stately.concurrency.AtomicInt
 import co.touchlab.testhelp.concurrency.ThreadOperations
 import co.touchlab.testhelp.concurrency.sleep
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.db.SqlCursor
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.db.SqlCursor
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
-import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.driver.test.TransacterTest
 
 class NativeTransacterTest : TransacterTest() {

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/connectionpool/BaseConcurrencyTest.kt

@@ -1,11 +1,11 @@
 package com.squareup.sqldelight.drivers.native.connectionpool
 
+import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.sqliter.DatabaseConfiguration
 import co.touchlab.sqliter.DatabaseFileContext
 import co.touchlab.sqliter.JournalMode
 import co.touchlab.testhelp.concurrency.currentTimeMillis
 import co.touchlab.testhelp.concurrency.sleep
-import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
 import com.squareup.sqldelight.drivers.native.wrapConnection
 import kotlin.native.concurrent.AtomicInt

drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/connectionpool/WalConcurrencyTest.kt

@@ -1,10 +1,10 @@
 package com.squareup.sqldelight.drivers.native.connectionpool
 
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlCursor
 import co.touchlab.testhelp.concurrency.ThreadOperations
 import co.touchlab.testhelp.concurrency.sleep
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlCursor
 import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
 import kotlin.native.concurrent.AtomicInt
 import kotlin.native.concurrent.TransferMode

drivers/sqlite-driver/src/main/kotlin/com/squareup/sqldelight/sqlite/driver/JdbcSqliteDriver.kt

@@ -1,6 +1,6 @@
 package com.squareup.sqldelight.sqlite.driver
 
-import com.squareup.sqldelight.Query
+import app.cash.sqldelight.Query
 import com.squareup.sqldelight.sqlite.driver.ConnectionManager.Transaction
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver.Companion.IN_MEMORY
 import java.sql.Connection

drivers/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteDriverTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.driver.sqlite
 
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.squareup.sqldelight.driver.test.DriverTest
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver.Companion.IN_MEMORY

drivers/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteQueryTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.driver.sqlite
 
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.squareup.sqldelight.driver.test.QueryTest
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver.Companion.IN_MEMORY

drivers/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteTransacterTest.kt

@@ -1,7 +1,7 @@
 package com.squareup.sqldelight.driver.sqlite
 
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.squareup.sqldelight.driver.test.TransacterTest
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver.Companion.IN_MEMORY

drivers/sqljs-driver/src/main/kotlin/com/squareup/sqldelight/drivers/sqljs/JsSqlDriver.kt

@@ -1,11 +1,11 @@
 package com.squareup.sqldelight.drivers.sqljs
 
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlPreparedStatement
 import org.khronos.webgl.Int8Array
 import org.khronos.webgl.Uint8Array
 import kotlin.js.Promise

drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt

@@ -1,8 +1,8 @@
 package com.squareup.sqldelight.drivers.sqljs
 
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlPreparedStatement
-import com.squareup.sqldelight.db.use
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlPreparedStatement
+import app.cash.sqldelight.db.use
 import kotlin.js.Promise
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest

drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsQueryTest.kt

@@ -1,9 +1,9 @@
 package com.squareup.sqldelight.drivers.sqljs
 
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.db.SqlCursor
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.internal.Atomic
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.db.SqlCursor
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.internal.Atomic
 import kotlin.js.Promise
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest

drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsTransacterTest.kt

@@ -1,8 +1,8 @@
 package com.squareup.sqldelight.drivers.sqljs
 
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.TransacterImpl
-import com.squareup.sqldelight.db.SqlDriver
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlDriver
 import kotlin.js.Promise
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest

extensions/android-paging/src/main/java/com/squareup/sqldelight/android/paging/QueryDataSourceFactory.kt

@@ -2,8 +2,8 @@ package com.squareup.sqldelight.android.paging
 
 import androidx.paging.DataSource
 import androidx.paging.PositionalDataSource
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
 
 class QueryDataSourceFactory<RowType : Any>(
   private val queryProvider: (limit: Long, offset: Long) -> Query<RowType>,

extensions/android-paging/src/test/java/com/squareup/sqldelight/android/paging/QueryDataSourceFactoryTest.kt

@@ -5,13 +5,13 @@ import androidx.paging.PositionalDataSource.LoadInitialParams
 import androidx.paging.PositionalDataSource.LoadRangeCallback
 import androidx.paging.PositionalDataSource.LoadRangeParams
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import app.cash.sqldelight.Query
+import app.cash.sqldelight.Transacter
+import app.cash.sqldelight.TransacterImpl
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.db.SqlDriver.Schema
 import com.google.common.truth.Truth.assertThat
-import com.squareup.sqldelight.Query
-import com.squareup.sqldelight.Transacter
-import com.squareup.sqldelight.TransacterImpl
 import com.squareup.sqldelight.android.AndroidSqliteDriver
-import com.squareup.sqldelight.db.SqlDriver
-import com.squareup.sqldelight.db.SqlDriver.Schema
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith