diff --git a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java index 8f6d37b2..d1136733 100644 --- a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java +++ b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java @@ -45,9 +45,9 @@ public void apply(Project project) { project.getPluginManager().apply(JavaLibraryPlugin.class); Provider generatedJavaDir = - project.getLayout().getBuildDirectory().dir("generated/sources/metric-schema/java/main"); + project.getLayout().getBuildDirectory().dir("generated/sources/metricSchema/java/main"); Provider generatedResourcesDir = - project.getLayout().getBuildDirectory().dir("generated/sources/metric-schema/resources/main"); + project.getLayout().getBuildDirectory().dir("generated/sources/metricSchema/resources/main"); Provider metricSchemaDir = project.getLayout().getBuildDirectory().dir("metricSchema"); diff --git a/gradle-metric-schema/src/test/groovy/com/palantir/metric/schema/gradle/MetricSchemaPluginIntegrationSpec.groovy b/gradle-metric-schema/src/test/groovy/com/palantir/metric/schema/gradle/MetricSchemaPluginIntegrationSpec.groovy index 8b316606..4cb56b30 100644 --- a/gradle-metric-schema/src/test/groovy/com/palantir/metric/schema/gradle/MetricSchemaPluginIntegrationSpec.groovy +++ b/gradle-metric-schema/src/test/groovy/com/palantir/metric/schema/gradle/MetricSchemaPluginIntegrationSpec.groovy @@ -101,7 +101,7 @@ class MetricSchemaPluginIntegrationSpec extends IntegrationSpec { then: def result = runTasksSuccessfully('classes') result.wasExecuted(':generateMetrics') - fileExists("build/generated/sources/metric-schema/java/main/com/palantir/test/ServerMetrics.java") + fileExists("build/generated/sources/metricSchema/java/main/com/palantir/test/ServerMetrics.java") } def 'build cache works'() { @@ -110,7 +110,7 @@ class MetricSchemaPluginIntegrationSpec extends IntegrationSpec { file('src/main/metrics/metrics.yml') << METRICS runTasksSuccessfully('generateMetrics') - fileExists("build/generated/sources/metric-schema/java/main/com/palantir/test/ServerMetrics.java") + fileExists("build/generated/sources/metricSchema/java/main/com/palantir/test/ServerMetrics.java") // we want cache hits no matter where the project is checked out on disk File originalProjectDir = getProjectDir() @@ -119,7 +119,7 @@ class MetricSchemaPluginIntegrationSpec extends IntegrationSpec { FileUtils.copyDirectory(originalProjectDir, newProjectDir) setProjectDir(newProjectDir) FileUtils.deleteDirectory(originalProjectDir) - FileUtils.deleteDirectory(file("build/generated/sources/metric-schema")) + FileUtils.deleteDirectory(file("build/generated/sources/metricSchema")) then: ExecutionResult result = runTasksSuccessfully('generateMetrics')