[geode] branch develop updated: GEODE-6383: Correct minor lingering issues from previous PR. (#3430)

[pr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

prhomberg 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 0c8d3bc  GEODE-6383: Correct minor lingering issues from previous PR. (#3430)
0c8d3bc is described below

commit 0c8d3bc6a26918a62deafd57f5580179dd80a2f0
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Mon Apr 8 20:23:19 2019 -0700

    GEODE-6383: Correct minor lingering issues from previous PR. (#3430)
    
    * In geode-core, add missing evaluation dependency geode-core
    * Remove implicit evaluation dependency in spotless.gradle on geode-core.
    * Move hook of spotlessApply into spotless.gradle from standard config.
---
 geode-pulse/build.gradle                        |  2 ++
 gradle/spotless.gradle                          | 11 +++++++++--
 gradle/standard-subproject-configuration.gradle |  4 ----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 30fe0d1..c46afd1 100644
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+evaluationDependsOn(':geode-core')
+
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 apply plugin: 'war'
 
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 0211d0d..32e1369 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -60,7 +60,7 @@ spotless {
         throw new AssertionError("Do not use Awaitility.await(). Use GeodeAwaitility.await() instead. 'spotlessApply' cannot resolve this issue.")
       }
     }
-    importOrderFile "${project(':geode-core').projectDir}/../etc/eclipseOrganizeImports.importorder"
+    importOrderFile "${rootDir}/${scriptDir}/../etc/eclipseOrganizeImports.importorder"
 
     custom 'Remove unhelpful javadoc stubs', {
       // e.g., remove the following lines:
@@ -114,11 +114,12 @@ spotless {
 
     // The format file is relative to geode-core and not the root project as the root project would change
     // if Geode and submodules are included as part of a different gradle project.
-    eclipse('4.6.3').configFile "${project(':geode-core').projectDir}/../etc/eclipse-java-google-style.xml"
+    eclipse('4.6.3').configFile "${rootDir}/${scriptDir}/../etc/eclipse-java-google-style.xml"
     trimTrailingWhitespace()
     endWithNewline()
   }
 
+
   groovyGradle {
     target project.fileTree(project.projectDir) {
       include '**/*.gradle'
@@ -153,4 +154,10 @@ afterEvaluate {
   // Not all projects are java projects.  findByName could return null, so use the null-safe ?. operator
   project.tasks.findByName('compileJava')?.mustRunAfter(spotlessCheck)
   project.tasks.findByName('compileJava')?.mustRunAfter(spotlessApply)
+
+  // Within the configure block, 'project' refers to the task-owning project, in this case rootProject
+  def thisProjectScoped = project
+  rootProject.tasks.named('devBuild').configure {
+    dependsOn thisProjectScoped.tasks.named('spotlessApply')
+  }
 }
diff --git a/gradle/standard-subproject-configuration.gradle b/gradle/standard-subproject-configuration.gradle
index c881609..5215aaa 100644
--- a/gradle/standard-subproject-configuration.gradle
+++ b/gradle/standard-subproject-configuration.gradle
@@ -49,7 +49,3 @@ rootProject.tasks.named('classes').configure {
     ]
   )
 }
-
-rootProject.tasks.named('devBuild').configure {
-  dependsOn thisProjectScoped.tasks.named('spotlessApply')
-}