From d5bd33ca1b91edfd85e47a99eb4876f6f12471d1 Mon Sep 17 00:00:00 2001 From: Xudong Ma Date: Wed, 2 Sep 2015 14:03:06 -0700 Subject: [PATCH] Fix generated code reference for intellij projects. --- benchmarks/build.gradle | 11 +++-------- examples/build.gradle | 11 +++-------- interop-testing/build.gradle | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 4d402e82b6..cfcdb51722 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -74,16 +74,11 @@ applicationDistribution.into("bin") { fileMode = 0755 } -// Allow intellij projects to refer to generated-sources +// Let intellij projects refer to generated code idea { module { - // The whole build dir is excluded by default, but we need build/generated-sources, - // which contains the generated proto classes. - excludeDirs = [file('.gradle')] - if (buildDir.exists()) { - excludeDirs += files(buildDir.listFiles()) - excludeDirs -= file("$buildDir/generated-sources") - } + sourceDirs += file("${projectDir}/src/generated/main/java"); + sourceDirs += file("${projectDir}/src/generated/main/grpc"); } } diff --git a/examples/build.gradle b/examples/build.gradle index 0f3ea5b004..ce0743ab3e 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -59,15 +59,10 @@ applicationDistribution.into("bin") { fileMode = 0755 } -// Allow intellij projects to refer to generated-sources +// Let intellij projects refer to generated code idea { module { - // The whole build dir is excluded by default, but we need build/generated-sources, - // which contains the generated proto classes. - excludeDirs = [file('.gradle')] - if (buildDir.exists()) { - excludeDirs += files(buildDir.listFiles()) - excludeDirs -= file("$buildDir/generated-sources") - } + sourceDirs += file("${projectDir}/src/generated/main/java"); + sourceDirs += file("${projectDir}/src/generated/main/grpc"); } } diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index 316a57e083..6c60c38b55 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -63,15 +63,10 @@ applicationDistribution.into("bin") { configureProtoCompilation() -// Allow intellij projects to refer to generated-sources +// Let intellij projects refer to generated code idea { module { - // The whole build dir is excluded by default, but we need build/generated-sources, - // which contains the generated proto classes. - excludeDirs = [file('.gradle')] - if (buildDir.exists()) { - excludeDirs += files(buildDir.listFiles()) - excludeDirs -= file("$buildDir/generated-sources") - } + sourceDirs += file("${projectDir}/src/generated/main/java"); + sourceDirs += file("${projectDir}/src/generated/main/grpc"); } }