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

Commit 8054b9d

Browse files
author
Bogdan Drutu
authored
Update dependencies version. (#54)
* Update dependencies version. * Fix build.
1 parent 92db696 commit 8054b9d

5 files changed

Lines changed: 18 additions & 16 deletions

File tree

WORKSPACE

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ workspace(name = "opencensus_proto")
1919
# This statement defines the @com_google_protobuf repo.
2020
http_archive(
2121
name = "com_google_protobuf",
22-
sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c",
23-
strip_prefix = "protobuf-3.5.0",
24-
urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
22+
sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f",
23+
strip_prefix = "protobuf-3.5.1",
24+
urls = ["https://github.com/google/protobuf/archive/v3.5.1.tar.gz"],
2525
)
2626

2727
http_archive(
2828
name = "com_google_protobuf_cc",
29-
sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c",
30-
strip_prefix = "protobuf-3.5.0",
31-
urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
29+
sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f",
30+
strip_prefix = "protobuf-3.5.1",
31+
urls = ["https://github.com/google/protobuf/archive/v3.5.1.tar.gz"],
3232
)
3333

3434
# java_proto_library rules implicitly depend on @com_google_protobuf_java//:java_toolchain,
3535
# which is the Java proto runtime (base classes and common utilities).
3636
http_archive(
3737
name = "com_google_protobuf_java",
38-
sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c",
39-
strip_prefix = "protobuf-3.5.0",
40-
urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
38+
sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f",
39+
strip_prefix = "protobuf-3.5.1",
40+
urls = ["https://github.com/google/protobuf/archive/v3.5.1.tar.gz"],
4141
)

build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ repositories {
88
maven { url "https://plugins.gradle.org/m2/" }
99
}
1010

11+
def protobufVersion = '3.5.1'
12+
def protocVersion = '3.5.1'
13+
1114
buildscript {
1215
repositories {
1316
maven { url "https://plugins.gradle.org/m2/" }
1417
}
1518
dependencies {
16-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
19+
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
1720
}
1821
}
1922

@@ -28,13 +31,13 @@ sourceSets {
2831
}
2932

3033
dependencies {
31-
compile 'com.google.protobuf:protobuf-java:3.5.0'
34+
compile "com.google.protobuf:protobuf-java:${protobufVersion}"
3235
}
3336

3437
protobuf {
3538
protoc {
3639
// The artifact spec for the Protobuf Compiler
37-
artifact = 'com.google.protobuf:protoc:3.5.0'
40+
artifact = "com.google.protobuf:protoc:${protocVersion}"
3841
}
3942

4043
generatedFilesBaseDir = "$projectDir/gen_gradle/src"

opencensus/proto/stats/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ cc_proto_library(
3131
java_proto_library(
3232
name = "stats_proto_java",
3333
deps = [":stats_proto"],
34-
)
34+
)

opencensus/proto/trace/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ proto_library(
1818
name = "trace_proto",
1919
srcs = ["trace.proto"],
2020
deps = [
21-
"@com_google_protobuf//:any_proto",
2221
"@com_google_protobuf//:timestamp_proto",
2322
"@com_google_protobuf//:wrappers_proto",
2423
],

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
<properties>
2626
<!-- for dynamically installing protoc -->
27-
<grpc.version>1.8.0</grpc.version>
28-
<protobuf.version>3.5.0</protobuf.version>
27+
<grpc.version>1.10.0</grpc.version>
28+
<protobuf.version>3.5.1</protobuf.version>
2929
</properties>
3030

3131
<build>

0 commit comments

Comments
 (0)