Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit d3b7200

Browse files
authored
Re-organize proto directory structure. (#103)
build.gradle and BUILD.bazel/WORKSPACE should not be under the same directory, since they expect different directory layout for proto files.
1 parent 91fbd95 commit d3b7200

File tree

21 files changed

+7
-9
lines changed

21 files changed

+7
-9
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ install:
4141
script:
4242
- case "$BUILD" in
4343
"BAZEL")
44+
cd src;
4445
bazel build --show_result=100 ... ;;
4546
"MVN")
4647
mvn verify ;;

build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ buildscript {
2323
sourceSets {
2424
main {
2525
proto {
26-
// In addition to the default 'src/main/proto'
27-
srcDir 'opencensus/proto/stats'
28-
srcDir 'opencensus/proto/metrics'
29-
srcDir 'opencensus/proto/trace'
26+
srcDir "src"
3027
}
3128
}
3229
}

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
5353
<protoSourceRoot>.</protoSourceRoot>
5454
<includes>
55-
<include>opencensus/proto/agent/*.proto</include>
56-
<include>opencensus/proto/exporter/*.proto</include>
57-
<include>opencensus/proto/stats/*.proto</include>
58-
<include>opencensus/proto/metrics/*.proto</include>
59-
<include>opencensus/proto/trace/*.proto</include>
55+
<include>src/opencensus/proto/agent/*.proto</include>
56+
<include>src/opencensus/proto/exporter/*.proto</include>
57+
<include>src/opencensus/proto/stats/*.proto</include>
58+
<include>src/opencensus/proto/metrics/*.proto</include>
59+
<include>src/opencensus/proto/trace/*.proto</include>
6060
</includes>
6161
</configuration>
6262
<executions>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)