fix: Remove use of compile/runtime configurations from integration/functional test plugins

aalmiray · aalmiray · commit 0c22df119915 · 2023-12-15T10:55:07.000-06:00
diff --git a/plugins/functionaltest-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/functionaltest/FunctionalTestPlugin.groovy b/plugins/functionaltest-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/functionaltest/FunctionalTestPlugin.groovy
@@ -110,12 +110,8 @@ class FunctionalTestPlugin extends AbstractKordampPlugin {
 
     @CompileStatic
     private void adjustConfigurations(Project project) {
-        String compileSuffix = 'Compile'
-        String runtimeSuffix = 'Runtime'
-        if (supportsApiConfiguration(project)) {
-            compileSuffix = 'Implementation'
-            runtimeSuffix = 'RuntimeOnly'
-        }
+        String compileSuffix = 'Implementation'
+        String runtimeSuffix = 'RuntimeOnly'
 
         project.configurations.findByName('functionalTest' + compileSuffix)
             .extendsFrom project.configurations.findByName(compileSuffix.uncapitalize())
@@ -138,15 +134,8 @@ class FunctionalTestPlugin extends AbstractKordampPlugin {
     }
 
     private void createConfigurationsIfNeeded(Project project) {
-        String compileSuffix = 'Compile'
-        String runtimeSuffix = 'Runtime'
-        if (supportsApiConfiguration(project)) {
-            compileSuffix = 'Implementation'
-            runtimeSuffix = 'RuntimeOnly'
-        }
-
-        project.configurations.maybeCreate('functionalTest' + compileSuffix)
-        project.configurations.maybeCreate('functionalTest' + runtimeSuffix)
+        project.configurations.maybeCreate('functionalTestImplementation')
+        project.configurations.maybeCreate('functionalTestRuntimeOnly')
     }
 
     private void createSourceSetsIfNeeded(Project project) {
diff --git a/plugins/integrationtest-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/integrationtest/IntegrationTestPlugin.groovy b/plugins/integrationtest-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/integrationtest/IntegrationTestPlugin.groovy
@@ -36,7 +36,6 @@ import javax.inject.Named
 import static org.kordamp.gradle.listener.ProjectEvaluationListenerManager.addProjectEvaluatedListener
 import static org.kordamp.gradle.util.PluginUtils.resolveConfig
 import static org.kordamp.gradle.util.PluginUtils.resolveSourceSets
-import static org.kordamp.gradle.util.PluginUtils.supportsApiConfiguration
 
 /**
  * @author Andres Almiray
@@ -115,12 +114,8 @@ class IntegrationTestPlugin extends AbstractKordampPlugin {
 
     @CompileStatic
     private void adjustConfigurations(Project project) {
-        String compileSuffix = 'Compile'
-        String runtimeSuffix = 'Runtime'
-        if (supportsApiConfiguration(project)) {
-            compileSuffix = 'Implementation'
-            runtimeSuffix = 'RuntimeOnly'
-        }
+        String compileSuffix = 'Implementation'
+        String runtimeSuffix = 'RuntimeOnly'
 
         project.configurations.findByName('integrationTest' + compileSuffix)
             .extendsFrom(project.configurations.findByName('test' + compileSuffix))
@@ -144,15 +139,8 @@ class IntegrationTestPlugin extends AbstractKordampPlugin {
     }
 
     private void createConfigurationsIfNeeded(Project project) {
-        String compileSuffix = 'Compile'
-        String runtimeSuffix = 'Runtime'
-        if (supportsApiConfiguration(project)) {
-            compileSuffix = 'Implementation'
-            runtimeSuffix = 'RuntimeOnly'
-        }
-
-        project.configurations.maybeCreate('integrationTest' + compileSuffix)
-        project.configurations.maybeCreate('integrationTest' + runtimeSuffix)
+        project.configurations.maybeCreate('integrationTestImplementation')
+        project.configurations.maybeCreate('integrationTestRuntimeOnly')
     }
 
     private void createSourceSetsIfNeeded(Project project) {
