Remove eager configuration (#5923)

apollographql · May 28, 2024 · 7bfc55f · 7bfc55f
1 parent 89ee17d
commit 7bfc55f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/...plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/internal/ApolloPlugin.kt b/...plugin-external/src/main/kotlin/com/apollographql/apollo3/gradle/internal/ApolloPlugin.kt
@@ -16,6 +16,7 @@ constructor(private val toolingModelRegistry: ToolingModelBuilderRegistry) : Plu
   override fun apply(project: Project) {
     val defaultService = project.objects.newInstance(DefaultService::class.java, project, "service")
     val apolloExtension: DefaultApolloExtension = project.extensions.create(ApolloExtension::class.java, "apollo", DefaultApolloExtension::class.java, project, defaultService) as DefaultApolloExtension
+
     project.configureDefaultVersionsResolutionStrategy()
     toolingModelRegistry.register(
         object : ToolingModelBuilder {

diff --git a/...ernal/src/main/kotlin/com/apollographql/apollo3/gradle/internal/DefaultApolloExtension.kt b/...ernal/src/main/kotlin/com/apollographql/apollo3/gradle/internal/DefaultApolloExtension.kt
@@ -265,24 +265,25 @@ abstract class DefaultApolloExtension(
   }
 
   private fun maybeLinkSqlite() {
-    val doLink = when (linkSqlite.orNull) {
+    when (linkSqlite.orNull) {
       false -> return // explicit opt-out
-      true -> true // explicit opt-in
+      true -> {
+        // explicit opt-in
+        linkSqlite(project)
+      }
       null -> { // default: automatic detection
-        project.configurations.any {
-          it.dependencies.any {
+        project.configurations.configureEach {
+          it.dependencies.configureEach {
             // Try to detect if a native version of apollo-normalized-cache-sqlite is in the classpath
-            it.name.contains("apollo-normalized-cache-sqlite")
+            if (it.name.contains("apollo-normalized-cache-sqlite")
                 && !it.name.contains("jvm")
-                && !it.name.contains("android")
+                && !it.name.contains("android")) {
+              linkSqlite(project)
+            }
           }
         }
       }
     }
-
-    if (doLink) {
-      linkSqlite(project)
-    }
   }
 
   /**
@@ -600,7 +601,7 @@ abstract class DefaultApolloExtension(
         codegenMetadataConsumerConfiguration.dependencies.add(it)
       }
 
-      val pending = pendingDownstreamDependencies.get(name)
+      val pending = pendingDownstreamDependencies.get(service.name)
       if (pending != null) {
         pending.forEach {
           service.isADependencyOf(project.project(it))