This is an automated email from the ASF dual-hosted git repository. jbarrett 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 ee77f8e Revert "GEODE-5363: Fixes issue with build in IJ IDEA." ee77f8e is described below commit ee77f8ef92c5f17ae71faa12c349f064d66914cc Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Wed Jul 18 12:16:22 2018 -0700 Revert "GEODE-5363: Fixes issue with build in IJ IDEA." This reverts commit 47932e85cc7dc76aa00a667552d1c0fc3fe52b85. --- geode-core/build.gradle | 21 --------------------- geode-lucene/build.gradle | 26 ++++++++++++++++++++++++++ gradle/test.gradle | 37 ++++++++++++++++++++++++++----------- 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 67f7a97..c288046 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -186,13 +186,6 @@ 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 { @@ -201,13 +194,6 @@ 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 { @@ -216,13 +202,6 @@ 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 b6b1243..95c7416 100644 --- a/geode-lucene/build.gradle +++ b/geode-lucene/build.gradle @@ -50,6 +50,32 @@ 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 b63bd2d..a1be69c 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -92,12 +92,14 @@ subprojects { srcDir file('src/integrationTest/java') } resources.srcDir file('src/integrationTest/resources') - compiledBy(assemble) apply plugin: 'idea' idea { module { - testSourceDirs += project.sourceSets.integrationTest.java.srcDirs - testSourceDirs += project.sourceSets.integrationTest.resources.srcDirs + sourceDirs -= java + resourceDirs -= resources + testSourceDirs += java + testResourceDirs += resources + scopes.TEST.plus += [ configurations.integrationTestCompile ] } } } @@ -112,8 +114,11 @@ subprojects { apply plugin: 'idea' idea { module { - testSourceDirs += project.sourceSets.distributedTest.java.srcDirs - testSourceDirs += project.sourceSets.distributedTest.resources.srcDirs + sourceDirs -= java + resourceDirs -= resources + testSourceDirs += java + testResourceDirs += resources + scopes.TEST.plus += [ configurations.distributedTestCompile ] } } } @@ -128,8 +133,11 @@ subprojects { apply plugin: 'idea' idea { module { - testSourceDirs += project.sourceSets.performanceTest.java.srcDirs - testSourceDirs += project.sourceSets.performanceTest.resources.srcDirs + sourceDirs -= java + resourceDirs -= resources + testSourceDirs += java + testResourceDirs += resources + scopes.TEST.plus += [ configurations.performanceTestCompile ] } } } @@ -144,8 +152,11 @@ subprojects { apply plugin: 'idea' idea { module { - testSourceDirs += project.sourceSets.acceptanceTest.java.srcDirs - testSourceDirs += project.sourceSets.acceptanceTest.resources.srcDirs + sourceDirs -= java + resourceDirs -= resources + testSourceDirs += java + testResourceDirs += resources + scopes.TEST.plus += [ configurations.acceptanceTestCompile ] } } } @@ -160,8 +171,11 @@ subprojects { apply plugin: 'idea' idea { module { - testSourceDirs += project.sourceSets.uiTest.java.srcDirs - testSourceDirs += project.sourceSets.uiTest.resources.srcDirs + sourceDirs -= java + resourceDirs -= resources + testSourceDirs += java + testResourceDirs += resources + scopes.TEST.plus += [ configurations.uiTestCompile ] } } } @@ -506,3 +520,4 @@ classes.dependsOn subprojects.compileIntegrationTestJava classes.dependsOn subprojects.compileDistributedTestJava classes.dependsOn subprojects.compileAcceptanceTestJava classes.dependsOn subprojects.compileUiTestJava +