geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject incubator-geode git commit: GEODE-522: Exclude only gradle output dirs from eclipse/idea project
Date Wed, 04 Nov 2015 00:37:48 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 97c53517e -> bb1b538ea


GEODE-522: Exclude only gradle output dirs from eclipse/idea project

Using minusConfigurations was causing gradle to exclude the entire
gemfire-core project from the gemfire-web classpath. All we wanted to
filter out was the generated output directories from gradle, which are
getting added because we have an ugly provided dependency on those
output directory.

Now we explicitly filter out only the directories we don't want.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bb1b538e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bb1b538e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bb1b538e

Branch: refs/heads/develop
Commit: bb1b538ea984a37f8040af1ab09de3422a7c8a76
Parents: 97c5351
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Tue Nov 3 14:39:18 2015 -0800
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Tue Nov 3 16:36:41 2015 -0800

----------------------------------------------------------------------
 gemfire-web/build.gradle | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb1b538e/gemfire-web/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-web/build.gradle b/gemfire-web/build.gradle
index 0c02b86..564b07d 100755
--- a/gemfire-web/build.gradle
+++ b/gemfire-web/build.gradle
@@ -17,8 +17,21 @@ dependencies {
 
   provided project(path: ':gemfire-junit', configuration: 'testOutput')
 }
-eclipse.classpath.minusConfigurations += [ project(':gemfire-core').configurations.classesOutput
]
-idea.module.scopes.PROVIDED.minus += [ project(':gemfire-core').configurations.classesOutput
]
+
+//Remove the gradle output directories from the eclipse classpath. These
+//are added by the classesOutput configuration, above. Unfortunately, using
+//minusConfigurations does not work here, because it removes the entire
+//gemfire-core project
+eclipse.classpath.file {
+    whenMerged { classpath ->
+        classpath.entries.removeAll { entry -> entry.path.contains('gemfire-core/build')}
+    }
+}
+idea.module.iml {
+  whenMerged {module ->
+     module.dependencies.removeAll { entry -> entry.toString().contains('gemfire-core/build')}
+  }
+}
 
 artifacts {
   archives jar


Mime
View raw message