Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,9 @@ subprojects {
exclude 'src/**/resources/'
exclude 'src/**/generated/'
exclude 'src/**/mainGeneratedDataTemplate/'
exclude 'src/**/mainGeneratedAvroSchema/'
exclude 'src/**/mainGeneratedGraphQL/'
exclude 'src/**/generatedJsonSchema/'
exclude 'src/**/mainGeneratedRest/'
exclude 'src/renamed/avro/'
exclude 'src/test/sample-test-plugins/'
Expand Down Expand Up @@ -568,18 +571,6 @@ subprojects {
}
}
}

afterEvaluate {
def spotlessJavaTask = tasks.findByName('spotlessJava')
def processTask = tasks.findByName('processResources')
if (processTask != null) {
spotlessJavaTask.dependsOn processTask
}
def compileJavaTask = tasks.findByName('compileJava')
if (compileJavaTask != null) {
spotlessJavaTask.dependsOn compileJavaTask
}
}
}

afterEvaluate {
Expand Down
5 changes: 0 additions & 5 deletions datahub-graphql-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ clean {
delete 'src/mainGeneratedGraphQL'
}

tasks.withType(Checkstyle) {
exclude "**/generated/**"
}

compileJava.dependsOn 'graphqlCodegen'
build.dependsOn ':datahub-web-react:graphqlPrettierCheck'
spotlessApply.dependsOn ':datahub-web-react:graphqlPrettierWrite'
sourceSets.main.java.srcDir "$projectDir/src/mainGeneratedGraphQL/java"
2 changes: 0 additions & 2 deletions entity-registry/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ dependencies {
testFixturesAnnotationProcessor externalDependency.lombok
}
compileTestJava.dependsOn tasks.getByPath(':entity-registry:custom-test-model:modelDeploy')

spotlessJava.dependsOn generateTestDataTemplate
2 changes: 0 additions & 2 deletions entity-registry/custom-test-model/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ configurations {
}
}

spotlessJava.dependsOn generateTestDataTemplate

//artifacts {
// builtModels(modelArtifact)
//}
Expand Down
6 changes: 5 additions & 1 deletion metadata-events/mxe-schemas/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,8 @@ clean {
delete 'bin'
}

generateTestDataTemplate.dependsOn spotlessJava
// This project only contains generated code, so disable Spotless
tasks.withType(com.diffplug.gradle.spotless.SpotlessTask).configureEach {
enabled = false
}

3 changes: 0 additions & 3 deletions metadata-service/restli-servlet-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,3 @@ pegasus.main.idlOptions.addIdlItem([
])

ext.apiProject = project(':metadata-service:restli-api')

spotlessJava.dependsOn generateTestDataTemplate
spotlessJava.dependsOn generateIntegTestDataTemplate
3 changes: 1 addition & 2 deletions test-models/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ idea {
}
}

sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/')
spotlessJava.dependsOn generateTestDataTemplate
sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/')
Loading