Skip to content

Commit

Permalink
GEODE-6383: Correct minor lingering issues from previous PR. (apache#…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
PurelyApplied authored Apr 9, 2019
1 parent 0393473 commit 0c8d3bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 2 additions & 0 deletions geode-pulse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* limitations under the License.
*/

evaluationDependsOn(':geode-core')

apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
apply plugin: 'war'

Expand Down
11 changes: 9 additions & 2 deletions gradle/spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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')
}
}
4 changes: 0 additions & 4 deletions gradle/standard-subproject-configuration.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,3 @@ rootProject.tasks.named('classes').configure {
]
)
}

rootProject.tasks.named('devBuild').configure {
dependsOn thisProjectScoped.tasks.named('spotlessApply')
}

0 comments on commit 0c8d3bc

Please sign in to comment.