Skip to content

Fix gson / opencensus bazel naming mixup #3379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2017
Merged

Fix gson / opencensus bazel naming mixup #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
957130c
Fix gson / opencensus bazel naming mixup
duelinmarkers Aug 23, 2017
4ab335e
Also fix bazel name of io.netty:netty-transport
duelinmarkers Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ java_library(
"@com_google_errorprone_error_prone_annotations//jar",
"@com_google_guava_guava//jar",
"@com_google_instrumentation_instrumentation_api//jar",
"@com_google_code_gson_gson//jar",
"@io_opencensus_opencensus_api//jar",
],
)

Expand Down
2 changes: 1 addition & 1 deletion netty/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ java_library(
"@io_netty_netty_handler//jar",
"@io_netty_netty_handler_proxy//jar",
"@io_netty_netty_resolver//jar",
"@io_netty_netty_netty_transport//jar",
"@io_netty_netty_transport//jar",
],
)
8 changes: 4 additions & 4 deletions repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def grpc_java_repositories(
)
native.bind(
name = "gson",
actual = "@com_google_code_gson//jar",
actual = "@com_google_code_gson_gson//jar",
)

def com_google_api_grpc_google_common_protos():
Expand All @@ -96,7 +96,7 @@ def com_google_code_findbugs_jsr305():

def com_google_code_gson():
native.maven_jar(
name = "com_google_code_gson",
name = "com_google_code_gson_gson",
artifact = "com.google.code.gson:gson:jar:2.7",
sha1 = "751f548c85fa49f330cecbb1875893f971b33c4e",
)
Expand Down Expand Up @@ -187,7 +187,7 @@ def io_netty_common():

def io_netty_transport():
native.maven_jar(
name = "io_netty_netty_netty_transport",
name = "io_netty_netty_transport",
artifact = "io.netty:netty-transport:4.1.14.Final",
sha1 = "3ed6474f1289635fc0696ec37380e20f258950a2",
)
Expand Down Expand Up @@ -243,7 +243,7 @@ def io_netty_tcnative_boringssl_static():

def io_opencensus_api():
native.maven_jar(
name = "com_google_code_gson_gson",
name = "io_opencensus_opencensus_api",
artifact = "io.opencensus:opencensus-api:0.5.1",
sha1 = "cbd0a716a7d85ac34b83d86b13f0a6655e45c2ba",
)