SqlNormalizedCacheFactory make sqldriver public to support Sqlcipher …

…data encryption. (#5972) * SqlNormalizedCacheFactory make sqldriver public to support Sqlcipher data encryption. * Add SqlDelight to api dependency and update API dump --------- Co-authored-by: Yuvaraj Yadav <[email protected]> Co-authored-by: BoD <[email protected]>
apollographql · Jun 17, 2024 · 70f99a0 · 70f99a0
1 parent 3004659
commit 70f99a0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/libraries/apollo-normalized-cache-sqlite/api/android/apollo-normalized-cache-sqlite.api b/libraries/apollo-normalized-cache-sqlite/api/android/apollo-normalized-cache-sqlite.api
@@ -33,6 +33,7 @@ public final class com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedC
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;)V
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;Z)V
 	public synthetic fun <init> (Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lcom/squareup/sqldelight/db/SqlDriver;)V
 	public fun <init> (Ljava/lang/String;)V
 	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun create ()Lcom/apollographql/apollo3/cache/normalized/api/NormalizedCache;

diff --git a/libraries/apollo-normalized-cache-sqlite/api/jvm/apollo-normalized-cache-sqlite.api b/libraries/apollo-normalized-cache-sqlite/api/jvm/apollo-normalized-cache-sqlite.api
@@ -10,6 +10,7 @@ public final class com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedC
 }
 
 public final class com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory : com/apollographql/apollo3/cache/normalized/api/NormalizedCacheFactory {
+	public fun <init> (Lcom/squareup/sqldelight/db/SqlDriver;)V
 	public fun <init> (Ljava/lang/String;)V
 	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V

diff --git a/libraries/apollo-normalized-cache-sqlite/build.gradle.kts b/libraries/apollo-normalized-cache-sqlite/build.gradle.kts
@@ -31,6 +31,7 @@ kotlin {
         api(project(":apollo-api"))
         api(project(":apollo-normalized-cache-api"))
         api(project(":apollo-normalized-cache"))
+        api(golatac.lib("sqldelight.runtime"))
       }
     }
 

diff --git a/...idMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt b/...idMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt
@@ -10,7 +10,7 @@ import com.apollographql.apollo3.cache.normalized.sql.internal.getSchema
 import com.squareup.sqldelight.android.AndroidSqliteDriver
 import com.squareup.sqldelight.db.SqlDriver
 
-actual class SqlNormalizedCacheFactory internal constructor(
+actual class SqlNormalizedCacheFactory actual constructor(
     private val driver: SqlDriver,
 ) : NormalizedCacheFactory() {
 

diff --git a/...leMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt b/...leMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt
@@ -7,7 +7,7 @@ import com.apollographql.apollo3.cache.normalized.sql.internal.getSchema
 import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
 
-actual class SqlNormalizedCacheFactory internal constructor(
+actual class SqlNormalizedCacheFactory actual constructor(
     private val driver: SqlDriver,
 ) : NormalizedCacheFactory() {
 

diff --git a/...onMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt b/...onMain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactory.kt
@@ -1,6 +1,7 @@
 package com.apollographql.apollo3.cache.normalized.sql
 
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
+import com.squareup.sqldelight.db.SqlDriver
 
 /**
  * Creates a new [NormalizedCacheFactory] that uses a persistent cache based on Sqlite
@@ -13,5 +14,7 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
  * Default: "apollo.db"
  *
  */
-expect class SqlNormalizedCacheFactory(name: String? = "apollo.db") : NormalizedCacheFactory
+expect class SqlNormalizedCacheFactory(name: String? = "apollo.db") : NormalizedCacheFactory{
+  constructor(driver: SqlDriver)
+}
 
diff --git a/...ain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactoryJvm.kt b/...ain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactoryJvm.kt
@@ -8,7 +8,7 @@ import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import java.util.Properties
 
-actual class SqlNormalizedCacheFactory internal constructor(
+actual class SqlNormalizedCacheFactory actual constructor(
     private val driver: SqlDriver,
 ) : NormalizedCacheFactory() {
   /**