Skip to content

Commit bb27d82

Browse files
Merge pull request #559 from Netflix/gradle-compatibility-enhancements
(chore) Gradle 8.2 compatibility work
2 parents 2c85ef0 + 2b3e43a commit bb27d82

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

graphql-dgs-codegen-gradle/generated-docs/Query.find.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## Example
99
```graphql
1010
{
11-
find(filter: {mandatoryString : "randomString", optionalString : "randomString", mandatoryNumber : 197539653235116614, optionalNumber : 5816126044854263270}) {
11+
find(filter: {mandatoryString : "randomString", optionalString : "randomString", mandatoryNumber : 269109734867147797, optionalNumber : 6032492703890891451}) {
1212
isSuccessful
1313
result
1414
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import org.gradle.api.Project
2323
import org.gradle.api.logging.Logging
2424
import org.gradle.api.plugins.JavaPlugin
2525
import org.gradle.api.plugins.JavaPluginConvention
26+
import org.gradle.api.plugins.JavaPluginExtension
2627
import org.gradle.api.tasks.SourceSet
28+
import org.gradle.util.GradleVersion
2729
import java.util.Optional
2830

2931
class CodegenPlugin : Plugin<Project> {
@@ -42,7 +44,9 @@ class CodegenPlugin : Plugin<Project> {
4244
generateJavaTaskProvider.configure { it.group = GRADLE_GROUP }
4345

4446
val javaConvention = project.convention.getPlugin(JavaPluginConvention::class.java)
45-
val sourceSets = javaConvention.sourceSets
47+
val javaExtension = project.extensions.getByType(JavaPluginExtension::class.java)
48+
49+
val sourceSets = if (GradleVersion.current() >= GradleVersion.version("7.1")) javaExtension.sourceSets else javaConvention.sourceSets
4650
val mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
4751
val outputDir = generateJavaTaskProvider.map(GenerateJavaTask::getOutputDir)
4852
mainSourceSet.java.srcDirs(project.files(outputDir).builtBy(generateJavaTaskProvider))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CodegenGradlePluginCompatibilityTest {
4040
lateinit var projectDir: File
4141

4242
@ParameterizedTest
43-
@ValueSource(strings = ["7.0.2", "7.1.1", "7.2"])
43+
@ValueSource(strings = ["7.0.2", "7.1.1", "7.2", "7.6", "8.0", "8.1"])
4444
fun `Test generateJava against multiple Gradle Versions`(gradleVersion: String) {
4545
prepareBuildGraphQLSchema(
4646
"""

0 commit comments

Comments
 (0)