Skip to content

Commit

Permalink
chore: clean up Bazel
Browse files Browse the repository at this point in the history
  • Loading branch information
chanseokoh committed Feb 2, 2022
1 parent 8068a62 commit 80115af
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 149 deletions.
20 changes: 5 additions & 15 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@ workspace(name = "gapic_generator_java")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")

# DO NOT REMOVE.
# This is needed to clobber any transitively-pulled in versions of bazel_skylib so that packages
# like protobuf will build.
http_archive(
name = "bazel_skylib",
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
],
)

jvm_maven_import_external(
name = "google_java_format_all_deps",
artifact = "com.google.googlejavaformat:google-java-format:jar:all-deps:1.7",
Expand Down Expand Up @@ -52,9 +40,11 @@ load("@com_google_api_gax_java//:repositories.bzl", "com_google_api_gax_java_rep

com_google_api_gax_java_repositories()

load("//:repositories.bzl", "gapic_generator_java_repositories")

gapic_generator_java_repositories()
http_archive(
name = "com_google_googleapis",
strip_prefix = "googleapis-0899ba0f4c053a4487ccf0b699df5f850e39a45f",
urls = ["https://github.com/googleapis/googleapis/archive/0899ba0f4c053a4487ccf0b699df5f850e39a45f.zip"],
)

# protobuf
RULES_JVM_EXTERNAL_TAG = "4.2"
Expand Down
2 changes: 1 addition & 1 deletion ad-hoc-compile-proto-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o errexit
# Some auto-generated Java proto library code for .proto files are not published anywhere,
# so currently, we need to build them using `java_proto_library()` to generate .jar files.
#
# Many of these are needed due to our usage in tests.
# Most of these are needed only for compiling test source files.
#
# 1. from grpc/grpc-proto: service_config.proto
#
Expand Down
31 changes: 11 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@
<artifactId>guava</artifactId>
<version>30.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>1.9.3</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
Expand Down Expand Up @@ -110,21 +105,6 @@
<artifactId>auto-value-annotations</artifactId>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.19.1</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
Expand Down Expand Up @@ -182,46 +162,57 @@
<artifactId>metadata-proto</artifactId>
<version>0.0.0</version>
</dependency>

<!-- for tests below -->
<dependency>
<groupId>com.google.api</groupId>
<artifactId>common-resources-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.api</groupId>
<artifactId>logging-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>pubsub-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>testdata</groupId>
<artifactId>deprecated-service-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>testdata</groupId>
<artifactId>bookshop-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>testdata</groupId>
<artifactId>showcase-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>testdata</groupId>
<artifactId>testgapic-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>testdata</groupId>
<artifactId>explicit-dynamic-routing-headers-testing-proto</artifactId>
<version>0.0.0</version>
<scope>test</scope>
</dependency>

</dependencies>
Expand Down
113 changes: 0 additions & 113 deletions repositories.bzl

This file was deleted.

0 comments on commit 80115af

Please sign in to comment.