From f3b08cf4393353becb395dfb41c6538902f4460e Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Wed, 11 Jun 2025 15:23:27 +0200 Subject: [PATCH] Simplify task wiring (#6562) --- .../apollo/gradle/internal/AndroidPluginFacade.kt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/AndroidPluginFacade.kt b/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/AndroidPluginFacade.kt index f7c8169d9f8..bf67536735d 100644 --- a/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/AndroidPluginFacade.kt +++ b/libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/AndroidPluginFacade.kt @@ -53,22 +53,9 @@ fun connectToAndroidSourceSet( outputDir: Provider, taskProvider: TaskProvider, ) { - val kotlinSourceSet = project.kotlinProjectExtension?.sourceSets?.getByName(sourceSetName)?.kotlin - if (kotlinSourceSet != null) { - kotlinSourceSet.srcDir(outputDir) - } - project.getMainVariants().configureEach { if (it.sourceSets.any { it.name == sourceSetName }) { - if (kotlinSourceSet == null) { - it.registerJavaGeneratingTask(taskProvider, outputDir.get().asFile) - } else { - // The kotlinSourceSet carries task dependencies, calling srcDir() above is enough - // to setup task dependencies - // addJavaSourceFoldersToModel is still required for AS to see the sources - // See https://github.com/apollographql/apollo-kotlin/issues/3351 - it.addJavaSourceFoldersToModel(outputDir.get().asFile) - } + it.registerJavaGeneratingTask(taskProvider, outputDir.get().asFile) } } }