Fix benchmarks (#5841)

apollographql · Apr 22, 2024 · e7472f7 · e7472f7
1 parent bb21996
commit e7472f7
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/benchmark/app/build.gradle.kts b/benchmark/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
   id("com.android.application")
   id("org.jetbrains.kotlin.android")
   id("com.apollographql.apollo3")
+  alias(libs.plugins.kotlin.compose)
 }
 
 android {
@@ -43,10 +44,6 @@ android {
   buildFeatures {
     compose = true
   }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-  }
 }
 
 dependencies {

diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -207,6 +207,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin" }
 kotlin-android-min = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin-min" }
 kotlin-android-max = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin-max" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-plugin" }
 kotlin-jvm-min = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin-min" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-plugin" }
 android-application = { id = "com.android.application", version.ref = "android-plugin" }

diff --git a/...monMain/kotlin/com/apollographql/apollo3/cache/normalized/api/OperationCacheExtensions.kt b/...monMain/kotlin/com/apollographql/apollo3/cache/normalized/api/OperationCacheExtensions.kt
@@ -38,6 +38,25 @@ fun <D : Executable.Data> Executable<D>.normalize(
       .normalize(writer.root() as Map<String, Any?>, rootField().selections, rootField().type.rawType())
 }
 
+@JvmOverloads
+fun <D : Executable.Data> Executable<D>.readDataFromCache(
+    customScalarAdapters: CustomScalarAdapters,
+    cache: ReadOnlyNormalizedCache,
+    cacheResolver: CacheResolver,
+    cacheHeaders: CacheHeaders,
+    fieldNameGenerator: FieldNameGenerator = DefaultFieldNameGenerator,
+): D {
+  val variables = variables(customScalarAdapters, true)
+  return readInternal(
+      cacheKey = CacheKey.rootKey(),
+      cache = cache,
+      cacheResolver = cacheResolver,
+      cacheHeaders = cacheHeaders,
+      variables = variables,
+      fieldNameGenerator = fieldNameGenerator,
+  ).toData(adapter(), customScalarAdapters, variables)
+}
+
 @JvmOverloads
 fun <D : Executable.Data> Executable<D>.readDataFromCache(
     cacheKey: CacheKey,
@@ -58,6 +77,25 @@ fun <D : Executable.Data> Executable<D>.readDataFromCache(
   ).toData(adapter(), customScalarAdapters, variables)
 }
 
+@JvmOverloads
+fun <D : Executable.Data> Executable<D>.readDataFromCache(
+    customScalarAdapters: CustomScalarAdapters,
+    cache: ReadOnlyNormalizedCache,
+    cacheResolver: ApolloResolver,
+    cacheHeaders: CacheHeaders,
+    fieldNameGenerator: FieldNameGenerator = DefaultFieldNameGenerator,
+): D {
+  val variables = variables(customScalarAdapters, true)
+  return readInternal(
+      cacheKey = CacheKey.rootKey(),
+      cache = cache,
+      cacheResolver = cacheResolver,
+      cacheHeaders = cacheHeaders,
+      variables = variables,
+      fieldNameGenerator = fieldNameGenerator,
+  ).toData(adapter(), customScalarAdapters, variables)
+}
+
 @JvmOverloads
 fun <D : Executable.Data> Executable<D>.readDataFromCache(
     cacheKey: CacheKey,