Support for modern API in IdeaModule

nebula-plugins · Oct 7, 2022 · ff0a9a8 · ff0a9a8
1 parent f616b8f
commit ff0a9a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
 
 
 plugins {
-    id 'nebula.plugin-plugin' version '17.0.0'
+    id 'nebula.plugin-plugin' version '17.1.0'
     id 'java-library'
 }
 
@@ -34,7 +34,7 @@ dependencies {
     implementation 'com.netflix.nebula:nebula-publishing-plugin:18.3.0'
     implementation 'com.netflix.nebula:gradle-contacts-plugin:6.0.0'
     implementation 'com.netflix.nebula:gradle-dependency-lock-plugin:12.4.1'
-    implementation 'com.netflix.nebula:gradle-info-plugin:11.3.3'
+    implementation 'com.netflix.nebula:gradle-info-plugin:11.4.1'
 }
 
 // We use hard coded versions here due to bundling compatibility, and we don't want to accidentally generate a lock file

diff --git a/src/main/groovy/nebula/plugin/responsible/ide/IdeaPluginConfigurer.groovy b/src/main/groovy/nebula/plugin/responsible/ide/IdeaPluginConfigurer.groovy
@@ -8,6 +8,7 @@ import org.gradle.api.tasks.SourceSet
 import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.gradle.plugins.ide.idea.model.IdeaModel
 import org.gradle.plugins.ide.idea.model.IdeaModule
+import org.gradle.util.GradleVersion
 
 class IdeaPluginConfigurer implements IdePluginConfigurer {
     private final Project project
@@ -46,7 +47,7 @@ class IdeaPluginConfigurer implements IdePluginConfigurer {
     private void configurePluginForTestSourceSet(SourceSet testSourceSet) {
         withIdeaModule { IdeaModule module ->
             testSourceSet.allSource.srcDirs.each { srcDir ->
-                module.testSourceDirs += srcDir
+                module.testSources.from(srcDir)
             }
 
             module.scopes.TEST.plus += [getConfiguration(testSourceSet.compileClasspathConfigurationName), getConfiguration(testSourceSet.runtimeClasspathConfigurationName)]

diff --git a/...test/groovy/nebula/plugin/responsible/OlderGradleNebulaIntegTestPluginLauncherSpec.groovy b/...test/groovy/nebula/plugin/responsible/OlderGradleNebulaIntegTestPluginLauncherSpec.groovy