SqlNormalizedCacheFactory make sqldriver public to support Sqlcipher …

…data encryption. (#5973) * SqlNormalizedCacheFactory make sqldriver public to support Sqlcipher data encryption. * Add SqlDelight to api dependency and update API dump --------- Co-authored-by: Yuvaraj Yadav <yuvaraj.yadav@daimlertruck.com> Co-authored-by: BoD <BoD@JRAF.org>
apollographql · Jun 17, 2024 · 8d609cd · 8d609cd
1 parent 2ace10e
commit 8d609cd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 3 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
@@ -28,6 +28,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;Lkotlin/jvm/functions/Function1;Z)V
 	public fun <init> (Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;Lkotlin/jvm/functions/Function1;ZLjava/lang/Long;)V
 	public synthetic fun <init> (Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;Lkotlin/jvm/functions/Function1;ZLjava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lapp/cash/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 create ()Lcom/apollographql/apollo3/cache/normalized/api/NormalizedCache;

diff --git a/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api b/libraries/apollo-normalized-cache-sqlite/api/apollo-normalized-cache-sqlite.klib.api
@@ -18,6 +18,7 @@ final class com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCache :
 }
 final class com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory : com.apollographql.apollo3.cache.normalized.api/NormalizedCacheFactory { // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory|null[0]
     constructor <init>() // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory.<init>|<init>(){}[0]
+    constructor <init>(app.cash.sqldelight.db/SqlDriver) // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory.<init>|<init>(app.cash.sqldelight.db.SqlDriver){}[0]
     constructor <init>(kotlin/String? = ...) // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory.<init>|<init>(kotlin.String?){}[0]
     constructor <init>(kotlin/String?, kotlin/String?) // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory.<init>|<init>(kotlin.String?;kotlin.String?){}[0]
     final fun create(): com.apollographql.apollo3.cache.normalized.api/NormalizedCache // com.apollographql.apollo3.cache.normalized.sql/SqlNormalizedCacheFactory.create|create(){}[0]

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> (Lapp/cash/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
@@ -27,6 +27,7 @@ kotlin {
         api(project(":apollo-api"))
         api(project(":apollo-normalized-cache-api"))
         api(project(":apollo-normalized-cache"))
+        api(libs.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
@@ -12,7 +12,7 @@ import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import app.cash.sqldelight.db.SqlDriver
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCache
 
-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.createDriver
 import com.apollographql.apollo3.cache.normalized.sql.internal.createRecordDatabase
 import com.apollographql.apollo3.cache.normalized.sql.internal.getSchema
 
-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,5 +1,6 @@
 package com.apollographql.apollo3.cache.normalized.sql
 
+import app.cash.sqldelight.db.SqlDriver
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCache
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
 
@@ -15,6 +16,7 @@ import com.apollographql.apollo3.cache.normalized.api.NormalizedCacheFactory
  *
  */
 expect class SqlNormalizedCacheFactory(name: String? = "apollo.db") : NormalizedCacheFactory {
+  constructor(driver: SqlDriver)
   override fun create(): NormalizedCache
 }
 
diff --git a/...ain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactoryJvm.kt b/...ain/kotlin/com/apollographql/apollo3/cache/normalized/sql/SqlNormalizedCacheFactoryJvm.kt
@@ -9,7 +9,7 @@ import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import com.apollographql.apollo3.cache.normalized.api.NormalizedCache
 import java.util.Properties
 
-actual class SqlNormalizedCacheFactory internal constructor(
+actual class SqlNormalizedCacheFactory actual constructor(
     private val driver: SqlDriver,
 ) : NormalizedCacheFactory() {
   /**