From a5407cce88bee2d45f4476800e65e6fca59c1233 Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Wed, 11 Jun 2025 11:26:32 +0200 Subject: [PATCH] Simplify task wiring --- .../gradle/internal/AndroidPluginFacade.kt | 16 +--------------- 1 file changed, 1 insertion(+), 15 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 ac8059110f3..35496a28505 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 @@ -70,29 +70,15 @@ private fun Project.getTestVariants(): NamedDomainObjectContainer { return container } - fun connectToAndroidSourceSet( project: Project, sourceSetName: String, 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) } } }