This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 47932e8 GEODE-5363: Fixes issue with build in IJ IDEA.
47932e8 is described below
commit 47932e85cc7dc76aa00a667552d1c0fc3fe52b85
Author: Jinmei Liao <[email protected]>
AuthorDate: Wed Jul 18 10:22:16 2018 -0700
GEODE-5363: Fixes issue with build in IJ IDEA.
---
geode-core/build.gradle | 21 +++++++++++++++++++++
geode-lucene/build.gradle | 26 --------------------------
gradle/test.gradle | 37 +++++++++++--------------------------
3 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index c288046..67f7a97 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -186,6 +186,13 @@ sourceSets {
srcDir file('src/integrationTest/java')
}
resources.srcDir file('src/integrationTest/resources')
+ apply plugin: 'idea'
+ idea {
+ module {
+ testSourceDirs += project.sourceSets.integrationTest.java.srcDirs
+ testSourceDirs += project.sourceSets.integrationTest.resources.srcDirs
+ }
+ }
}
distributedTest {
java {
@@ -194,6 +201,13 @@ sourceSets {
srcDir file('src/distributedTest/java')
}
resources.srcDir file('src/distributedTest/resources')
+ apply plugin: 'idea'
+ idea {
+ module {
+ testSourceDirs += project.sourceSets.distributedTest.java.srcDirs
+ testSourceDirs += project.sourceSets.distributedTest.resources.srcDirs
+ }
+ }
}
performanceTest {
java {
@@ -202,6 +216,13 @@ sourceSets {
srcDir file('src/performanceTest/java')
}
resources.srcDir file('src/performanceTest/resources')
+ apply plugin: 'idea'
+ idea {
+ module {
+ testSourceDirs += project.sourceSets.performanceTest.java.srcDirs
+ testSourceDirs += project.sourceSets.performanceTest.resources.srcDirs
+ }
+ }
}
}
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 95c7416..b6b1243 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -50,32 +50,6 @@ configurations {
performanceTestRuntime.extendsFrom testRuntime
}
-sourceSets {
- integrationTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/integrationTest/java')
- }
- resources.srcDir file('src/integrationTest/resources')
- }
- distributedTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/distributedTest/java')
- }
- resources.srcDir file('src/distributedTest/resources')
- }
- performanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/performanceTest/java')
- }
- resources.srcDir file('src/performanceTest/resources')
- }
-}
dependencies {
// TODO build - move dunit framework to shared module.
diff --git a/gradle/test.gradle b/gradle/test.gradle
index a1be69c..b63bd2d 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -92,14 +92,12 @@ subprojects {
srcDir file('src/integrationTest/java')
}
resources.srcDir file('src/integrationTest/resources')
+ compiledBy(assemble)
apply plugin: 'idea'
idea {
module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.integrationTestCompile ]
+ testSourceDirs += project.sourceSets.integrationTest.java.srcDirs
+ testSourceDirs +=
project.sourceSets.integrationTest.resources.srcDirs
}
}
}
@@ -114,11 +112,8 @@ subprojects {
apply plugin: 'idea'
idea {
module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.distributedTestCompile ]
+ testSourceDirs += project.sourceSets.distributedTest.java.srcDirs
+ testSourceDirs +=
project.sourceSets.distributedTest.resources.srcDirs
}
}
}
@@ -133,11 +128,8 @@ subprojects {
apply plugin: 'idea'
idea {
module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.performanceTestCompile ]
+ testSourceDirs += project.sourceSets.performanceTest.java.srcDirs
+ testSourceDirs +=
project.sourceSets.performanceTest.resources.srcDirs
}
}
}
@@ -152,11 +144,8 @@ subprojects {
apply plugin: 'idea'
idea {
module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.acceptanceTestCompile ]
+ testSourceDirs += project.sourceSets.acceptanceTest.java.srcDirs
+ testSourceDirs += project.sourceSets.acceptanceTest.resources.srcDirs
}
}
}
@@ -171,11 +160,8 @@ subprojects {
apply plugin: 'idea'
idea {
module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.uiTestCompile ]
+ testSourceDirs += project.sourceSets.uiTest.java.srcDirs
+ testSourceDirs += project.sourceSets.uiTest.resources.srcDirs
}
}
}
@@ -520,4 +506,3 @@ classes.dependsOn subprojects.compileIntegrationTestJava
classes.dependsOn subprojects.compileDistributedTestJava
classes.dependsOn subprojects.compileAcceptanceTestJava
classes.dependsOn subprojects.compileUiTestJava
-
