diff options
| -rw-r--r-- | alts/build.gradle | 7 | ||||
| -rw-r--r-- | benchmarks/build.gradle | 9 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | grpclb/build.gradle | 7 | ||||
| -rw-r--r-- | interop-testing/build.gradle | 8 | ||||
| -rw-r--r-- | protobuf-lite/build.gradle | 6 | ||||
| -rw-r--r-- | protobuf-nano/build.gradle | 6 | ||||
| -rw-r--r-- | services/build.gradle | 10 | ||||
| -rw-r--r-- | testing-proto/build.gradle | 8 |
9 files changed, 1 insertions, 62 deletions
diff --git a/alts/build.gradle b/alts/build.gradle index 64cee9aa5..271699592 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -41,10 +41,3 @@ configureProtoCompilation() javadoc { exclude 'io/grpc/alts/internal/**' } - -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/grpc"); - sourceDirs += file("${projectDir}/src/generated/main/java"); - } -} diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index a0499e3ac..77727d0cd 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -91,12 +91,3 @@ applicationDistribution.into("bin") { from(benchmark_worker) fileMode = 0755 } - -// Let intellij projects refer to generated code -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/java"); - sourceDirs += file("${projectDir}/src/generated/main/grpc"); - } -} - diff --git a/build.gradle b/build.gradle index 689e230fa..03f2309b7 100644 --- a/build.gradle +++ b/build.gradle @@ -207,7 +207,7 @@ subprojects { protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1", protoc_lite: "com.google.protobuf:protoc-gen-javalite:3.0.0", protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}", - protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.8.3', + protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.8.5', protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}", lang: "org.apache.commons:commons-lang3:3.5", diff --git a/grpclb/build.gradle b/grpclb/build.gradle index 921a14ca6..f1d3164fc 100644 --- a/grpclb/build.gradle +++ b/grpclb/build.gradle @@ -22,10 +22,3 @@ dependencies { } configureProtoCompilation() - -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/grpc"); - sourceDirs += file("${projectDir}/src/generated/main/java"); - } -} diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index 3de557391..ce3c61104 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -101,11 +101,3 @@ applicationDistribution.into("bin") { from(http2_client) fileMode = 0755 } - -// Let intellij projects refer to generated code -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/java") - sourceDirs += file("${projectDir}/src/generated/main/grpc") - } -} diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle index 719910fa1..ff777fdac 100644 --- a/protobuf-lite/build.gradle +++ b/protobuf-lite/build.gradle @@ -59,9 +59,3 @@ protobuf { } } } - -idea { - module { - testSourceDirs += file("${projectDir}/build/generated/source/proto/test/javalite/") - } -} diff --git a/protobuf-nano/build.gradle b/protobuf-nano/build.gradle index 03ef6e89f..2d2b63007 100644 --- a/protobuf-nano/build.gradle +++ b/protobuf-nano/build.gradle @@ -36,9 +36,3 @@ if (project.hasProperty('protobuf')) { } } } - -idea { - module { - sourceDirs += file("${projectDir}/src/generated/test/javanano"); - } -} diff --git a/services/build.gradle b/services/build.gradle index f2de92d7f..559ce5797 100644 --- a/services/build.gradle +++ b/services/build.gradle @@ -30,13 +30,3 @@ dependencies { } configureProtoCompilation() - -// Let intellij projects refer to generated code -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/java"); - sourceDirs += file("${projectDir}/src/generated/main/grpc"); - testSourceDirs += file("${projectDir}/src/generated/test/java") - testSourceDirs += file("${projectDir}/src/generated/test/grpc") - } -} diff --git a/testing-proto/build.gradle b/testing-proto/build.gradle index d28992127..da07f65af 100644 --- a/testing-proto/build.gradle +++ b/testing-proto/build.gradle @@ -20,11 +20,3 @@ dependencies { } configureProtoCompilation() - -// Let intellij projects refer to generated code -idea { - module { - sourceDirs += file("${projectDir}/src/generated/main/java") - sourceDirs += file("${projectDir}/src/generated/main/grpc") - } -} |