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

Commit

Permalink
Update dependencies version. (#54)
Browse files Browse the repository at this point in the history
* Update dependencies version.

* Fix build.
  • Loading branch information
Bogdan Drutu authored Apr 19, 2018
1 parent 92db696 commit 8054b9d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
18 changes: 9 additions & 9 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ workspace(name = "opencensus_proto")
# This statement defines the @com_google_protobuf repo.
http_archive(
name = "com_google_protobuf",
sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c",
strip_prefix = "protobuf-3.5.0",
urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f",
strip_prefix = "protobuf-3.5.1",
urls = ["https://github.com/google/protobuf/archive/v3.5.1.tar.gz"],
)

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

# java_proto_library rules implicitly depend on @com_google_protobuf_java//:java_toolchain,
# which is the Java proto runtime (base classes and common utilities).
http_archive(
name = "com_google_protobuf_java",
sha256 = "0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c",
strip_prefix = "protobuf-3.5.0",
urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f",
strip_prefix = "protobuf-3.5.1",
urls = ["https://github.com/google/protobuf/archive/v3.5.1.tar.gz"],
)
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ repositories {
maven { url "https://plugins.gradle.org/m2/" }
}

def protobufVersion = '3.5.1'
def protocVersion = '3.5.1'

buildscript {
repositories {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
}
}

Expand All @@ -28,13 +31,13 @@ sourceSets {
}

dependencies {
compile 'com.google.protobuf:protobuf-java:3.5.0'
compile "com.google.protobuf:protobuf-java:${protobufVersion}"
}

protobuf {
protoc {
// The artifact spec for the Protobuf Compiler
artifact = 'com.google.protobuf:protoc:3.5.0'
artifact = "com.google.protobuf:protoc:${protocVersion}"
}

generatedFilesBaseDir = "$projectDir/gen_gradle/src"
Expand Down
2 changes: 1 addition & 1 deletion opencensus/proto/stats/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ cc_proto_library(
java_proto_library(
name = "stats_proto_java",
deps = [":stats_proto"],
)
)
1 change: 0 additions & 1 deletion opencensus/proto/trace/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ proto_library(
name = "trace_proto",
srcs = ["trace.proto"],
deps = [
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:timestamp_proto",
"@com_google_protobuf//:wrappers_proto",
],
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

<properties>
<!-- for dynamically installing protoc -->
<grpc.version>1.8.0</grpc.version>
<protobuf.version>3.5.0</protobuf.version>
<grpc.version>1.10.0</grpc.version>
<protobuf.version>3.5.1</protobuf.version>
</properties>

<build>
Expand Down

0 comments on commit 8054b9d

Please sign in to comment.