From 0dd6424bca6a940c1282ea0b1fd7f591003a3ed3 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Thu, 19 Dec 2019 12:19:21 -0800 Subject: [PATCH 1/2] Mark test resources as test resources in IntelliJ --- .../baseline/plugins/BaselineIdea.groovy | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy index 3f0c2fdcb..986a2dfd3 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy @@ -64,7 +64,6 @@ class BaselineIdea extends AbstractBaselinePlugin { } // Configure Idea module - markResourcesDirs(ideaModuleModel) moveProjectReferencesToEnd(ideaModuleModel) } @@ -281,24 +280,6 @@ class BaselineIdea extends AbstractBaselinePlugin { return base.appendNode(name, attributes + defaults) } - /** - * By default the Idea plugin marks resources dirs as source dirs. - */ - private void markResourcesDirs(IdeaModel ideaModel) { - ideaModel.module.iml.withXml { - def node = it.asNode() - def content = node.component.find { it.'@name' == 'NewModuleRootManager' }.content[0] - content.sourceFolder.each { sourceFolder -> - if(sourceFolder.@url?.endsWith('/resources')) { - sourceFolder.attributes().with { - boolean isTestSource = (remove('isTestSource') == 'true') - put('type', isTestSource ? 'java-test-resource' : 'java-resource') - } - } - } - } - } - /** * By default, IntelliJ and Gradle have different classpath behaviour with subprojects. * From cc5df930bd965e1f7e2d1f34a4f9fb48a96c2ea1 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Thu, 19 Dec 2019 20:19:21 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-1134.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-1134.v2.yml diff --git a/changelog/@unreleased/pr-1134.v2.yml b/changelog/@unreleased/pr-1134.v2.yml new file mode 100644 index 000000000..ba71b9e10 --- /dev/null +++ b/changelog/@unreleased/pr-1134.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: The `baseline-idea` plugin now correctly marks test resources as test + resources in IntelliJ. + links: + - https://github.com/palantir/gradle-baseline/pull/1134