Revert "Merge pull request #564 from Sineaggi/add-support-for-configu…

…ration-cache"

This reverts commit e5185ac, reversing
changes made to 127a6d2.

graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt

@@ -51,22 +51,8 @@ class CodegenPlugin : Plugin<Project> {
         val outputDir = generateJavaTaskProvider.map(GenerateJavaTask::getOutputDir)
         mainSourceSet.java.srcDirs(project.files(outputDir).builtBy(generateJavaTaskProvider))
 
-        val dgsCodegen = project.configurations.create("dgsCodegen")
-        dgsCodegen.isCanBeResolved = true
-        generateJavaTaskProvider.configure {
-            it.dependencies.addAll(
-                dgsCodegen.incoming.dependencies.map { dependency ->
-                    InternalSimpleDependency(dependency.name, dependency.group)
-                }
-            )
-            if (GradleVersion.current() >= GradleVersion.version("7.4")) {
-                it.schemaJarArtifacts.addAll(dgsCodegen.incoming.artifacts.resolvedArtifacts.map { it.map { it.id } })
-                it.schemaJarFiles.addAll(dgsCodegen.incoming.artifacts.resolvedArtifacts.map { it.map { it.file } })
-            } else {
-                it.schemaJarArtifacts.addAll(project.provider { dgsCodegen.incoming.artifacts.artifacts.map { it.id } })
-                it.schemaJarFiles.addAll(project.provider { dgsCodegen.incoming.artifacts.artifacts.map { it.file } })
-            }
-        }
+        project.configurations.create("dgsCodegen")
+        project.configurations.findByName("dgsCodegen")?.isCanBeResolved = true
 
         project.afterEvaluate { p ->
             if (extensions.clientCoreConventionsEnabled.getOrElse(true)) {

graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt

@@ -22,7 +22,6 @@ import com.netflix.graphql.dgs.codegen.CodeGen
 import com.netflix.graphql.dgs.codegen.CodeGenConfig
 import com.netflix.graphql.dgs.codegen.Language
 import org.gradle.api.DefaultTask
-import org.gradle.api.artifacts.component.ComponentArtifactIdentifier
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
 import java.io.File
@@ -149,23 +148,13 @@ open class GenerateJavaTask : DefaultTask() {
     @Input
     var includeClassImports = mutableMapOf<String, MutableMap<String, String>>()
 
-    @Input
-    val dependencies = project.objects.setProperty(InternalSimpleDependency::class.java)
-
-    @Input
-    val schemaJarArtifacts = project.objects.listProperty(ComponentArtifactIdentifier::class.java)
-
-    @InputFiles
-    val schemaJarFiles = project.objects.listProperty(File::class.java)
-
     @TaskAction
     fun generate() {
         val schemaJarFilesFromDependencies = emptyList<File>().toMutableList()
-        dependencies.get().forEach { dependency ->
+        val dgsCodegenConfig = project.configurations.findByName("dgsCodegen")
+        dgsCodegenConfig?.incoming?.dependencies?.forEach { dependency ->
             logger.info("Found DgsCodegen Dependendency: ${dependency.name}")
-            data class InternalArtifactResult(val id: ComponentArtifactIdentifier, val file: File)
-            val resolvedArtifacts = schemaJarArtifacts.get().zip(schemaJarFiles.get()) { id, file -> InternalArtifactResult(id, file) }
-            val found = resolvedArtifacts.find { it.id.componentIdentifier.displayName.contains(dependency.group + ":" + dependency.name) }
+            val found = dgsCodegenConfig.incoming.artifacts.resolvedArtifacts.get().find { it.id.componentIdentifier.displayName.contains(dependency.group + ":" + dependency.name) }
             if (found != null) {
                 logger.info("Found DgsCodegen Artifact: ${found.id.displayName}")
                 schemaJarFilesFromDependencies.add(found.file)

graphql-dgs-codegen-gradle/src/test/kotlin/com/netflix/graphql/dgs/CodegenGradlePluginCompatibilityTest.kt

@@ -23,7 +23,6 @@ package com.netflix.graphql.dgs
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome.SUCCESS
-import org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
@@ -107,7 +106,6 @@ class CodegenGradlePluginCompatibilityTest {
             .withPluginClasspath()
             .withDebug(true)
             .withArguments(
-                "--configuration-cache",
                 "--stacktrace",
                 "--info",
                 "generateJava",
@@ -116,24 +114,6 @@ class CodegenGradlePluginCompatibilityTest {
 
         assertThat(result.task(":generateJava")).extracting { it?.outcome }.isEqualTo(SUCCESS)
         assertThat(result.task(":build")).extracting { it?.outcome }.isEqualTo(SUCCESS)
-        assertThat(result.output).contains("Configuration cache entry stored.")
-
-        val rerunResult = GradleRunner.create()
-            .withGradleVersion(gradleVersion)
-            .withProjectDir(projectDir)
-            .withPluginClasspath()
-            .withDebug(true)
-            .withArguments(
-                "--configuration-cache",
-                "--stacktrace",
-                "--info",
-                "generateJava",
-                "build"
-            ).build()
-
-        assertThat(rerunResult.task(":generateJava")).extracting { it?.outcome }.isEqualTo(UP_TO_DATE)
-        assertThat(rerunResult.task(":build")).extracting { it?.outcome }.isEqualTo(UP_TO_DATE)
-        assertThat(rerunResult.output).contains("Configuration cache entry reused.")
     }
 
     private fun prepareBuildGradleFile(content: String) {