Unbreak benchmark (#6641)

Author: martinbonnin

benchmark/build-logic/build.gradle.kts

@@ -1,9 +1,14 @@
 plugins {
-  `embedded-kotlin`
-  `java-gradle-plugin`
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.compat.patrouille)
 }
 
-group = "com.apollographql.apollo.benchmark"
+group = "benchmark"
+
+compatPatrouille {
+  java(17)
+  kotlin(embeddedKotlinVersion)
+}
 
 dependencies {
   compileOnly(gradleApi())
@@ -13,13 +18,3 @@ dependencies {
   implementation(libs.android.plugin)
   implementation(libs.benchmark.gradle.plugin)
 }
-
-
-gradlePlugin {
-  plugins {
-    register("apollo.benchmark") {
-      id = "apollo.benchmark"
-      implementationClass = "BenchmarkPlugin"
-    }
-  }
-}

benchmark/build-logic/gradle

@@ -0,0 +1 @@
+../../gradle

benchmark/build-logic/gradlew

@@ -0,0 +1 @@
+../../gradlew

benchmark/build.gradle.kts

@@ -1,4 +1,10 @@
 plugins {
-  id("apollo.benchmark").apply(false)
-  alias(libs.plugins.apollo).apply(false)
+  id("base")
 }
+
+buildscript {
+  dependencies {
+    classpath("com.apollographql.apollo:apollo-gradle-plugin")
+    classpath("benchmark:build-logic")
+  }
+}

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreIncubatingTests.kt

@@ -12,6 +12,7 @@ import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
@@ -50,9 +51,11 @@ class ApolloStoreIncubatingTests {
         threadPool.submit {
           // Let each thread execute a few writes/reads
           repeat(WORK_LOAD) {
-            apolloStore.writeOperation(query, data)
-            val data2 = apolloStore.readOperation(query).data
-            Assert.assertEquals(data, data2)
+            runBlocking {
+              apolloStore.writeOperation(query, data)
+              val data2 = apolloStore.readOperation(query).data
+              Assert.assertEquals(data, data2)
+            }
           }
         }
       }

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingTests.kt

@@ -73,8 +73,10 @@ class CacheIncubatingTests {
       registerCacheSize("CacheIncubatingTests", testName, dbFile.length())
     }
     benchmarkRule.measureRepeated {
-      val data2 = cacheManager.readOperation(query).data!!
-      check(data2)
+      runBlocking {
+        val data2 = cacheManager.readOperation(query).data!!
+        check(data2)
+      }
     }
   }
 }

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/FakeData.kt

@@ -8,10 +8,11 @@ import com.apollographql.apollo.conferences.fragment.SpeakerDetails
 import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.api.ApolloCacheHeaders
 import com.apollographql.cache.normalized.api.CacheHeaders
+import kotlinx.coroutines.runBlocking
 
 const val SESSION_COUNT = 100
 
-fun primeCache(cacheManager: CacheManager) {
+fun primeCache(cacheManager: CacheManager) = runBlocking {
   val query1 = GetConferenceDataQuery(Optional.present(SESSION_COUNT))
   var data: GetConferenceDataQuery.Data = GetConferenceDataQuery.Data(
       sessions = createSessions(0),

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/GarbageCollectTests.kt

@@ -11,6 +11,7 @@ import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
 import com.apollographql.cache.normalized.garbageCollect
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
+import kotlinx.coroutines.runBlocking
 import org.junit.Rule
 import org.junit.Test
 import kotlin.time.Duration.Companion.days
@@ -27,8 +28,10 @@ class GarbageCollectTests {
         cacheManager = CacheManager(MemoryCacheFactory())
         primeCache(cacheManager)
       }
-      cacheManager.accessCache {
-        it.garbageCollect(maxAgeProvider)
+      runBlocking {
+        cacheManager.accessCache {
+          it.garbageCollect(maxAgeProvider)
+        }
       }
     }
   }
@@ -42,8 +45,10 @@ class GarbageCollectTests {
         cacheManager = CacheManager(SqlNormalizedCacheFactory(dbName))
         primeCache(cacheManager)
       }
-      cacheManager.accessCache {
-        it.garbageCollect(maxAgeProvider)
+      runBlocking {
+        cacheManager.accessCache {
+          it.garbageCollect(maxAgeProvider)
+        }
       }
     }
   }
@@ -57,8 +62,10 @@ class GarbageCollectTests {
         cacheManager = CacheManager(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName)))
         primeCache(cacheManager)
       }
-      cacheManager.accessCache {
-        it.garbageCollect(maxAgeProvider)
+      runBlocking {
+        cacheManager.accessCache {
+          it.garbageCollect(maxAgeProvider)
+        }
       }
     }
   }

benchmark/settings.gradle.kts

@@ -1,6 +1,3 @@
-pluginManagement {
-  includeBuild("build-logic")
-}
 plugins {
   id("com.gradle.develocity") version "4.1" // sync with libraries.toml
   id("com.gradle.common-custom-user-data-gradle-plugin") version "2.3"
@@ -28,4 +25,5 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
   }
 }
 
+includeBuild("build-logic")
 includeBuild("../")

gradle/libraries.toml

@@ -17,7 +17,7 @@ androidx-sqlite = "2.3.1"
 # This is used by the gradle integration tests to get the artifacts locally
 apollo = "5.0.0-alpha.2-SNAPSHOT"
 apollo-execution = "0.1.0"
-apollo-normalizedcache-incubating = "1.0.0-alpha.3"
+apollo-normalizedcache-incubating = "1.0.0-alpha.4"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.0.1"
 atomicfu = "0.26.0"