From 00d7f3f8d6cd2c3aa3e74d0e83df8175516bce7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?= <148013+szpak@users.noreply.github.com> Date: Thu, 6 Jul 2023 21:56:36 +0200 Subject: [PATCH] [#343] Simplify getting SourceSetContainer It is an extension itself and is compatible also with Gradle 6.4. --- .../solidsoft/gradle/pitest/PitestPlugin.groovy | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy b/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy index 646387f2..7a3eee5c 100644 --- a/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy +++ b/src/main/groovy/info/solidsoft/gradle/pitest/PitestPlugin.groovy @@ -27,8 +27,6 @@ import org.gradle.api.file.FileCollection import org.gradle.api.logging.Logger import org.gradle.api.logging.Logging import org.gradle.api.plugins.JavaPlugin -import org.gradle.api.plugins.JavaPluginConvention -import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.provider.Provider import org.gradle.api.reporting.ReportingExtension import org.gradle.api.tasks.Internal @@ -108,7 +106,7 @@ class PitestPlugin implements Plugin { extension = project.extensions.create("pitest", PitestPluginExtension, project) setupReportDirInExtensionWithProblematicTypeForGradle5() extension.pitestVersion.set(DEFAULT_PITEST_VERSION) - SourceSetContainer javaSourceSets = getSourceSetContainer() + SourceSetContainer javaSourceSets = project.extensions.getByType(SourceSetContainer) extension.testSourceSets.set([javaSourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME)]) extension.mainSourceSets.set([javaSourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)]) extension.fileExtensionsToFilter.set(DEFAULT_FILE_EXTENSIONS_TO_FILTER_FROM_CLASSPATH) @@ -116,17 +114,6 @@ class PitestPlugin implements Plugin { extension.verbosity.set("NO_SPINNER") } - @CompileDynamic //Remove once only Gradle 7.1+ are supported - private SourceSetContainer getSourceSetContainer() { - GradleVersion minimalVersionWithSourceSetsInJavaPluginExtension = GradleVersion.version("7.1") - - if (GradleVersion.current() < minimalVersionWithSourceSetsInJavaPluginExtension) { - return project.convention.getPlugin(JavaPluginConvention).sourceSets - } else { - return project.extensions.getByType(JavaPluginExtension).sourceSets - } - } - private void failWithMeaningfulErrorMessageOnUnsupportedConfigurationInRootProjectBuildScript() { if (project.rootProject.buildscript.configurations.findByName(PITEST_CONFIGURATION_NAME) != null) { throw new GradleException("The '${PITEST_CONFIGURATION_NAME}' buildscript configuration found in the root project. " +