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

fix: declare depenencies of API surfaces as api #1535

Merged
merged 4 commits into from Oct 18, 2021
Merged

fix: declare depenencies of API surfaces as api #1535

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63c2ed3
deps: declaring the latest auth library version
suztomo Oct 16, 2021
b3c3595
fix: declare API surface as api configuration
suztomo Oct 16, 2021
65027e3
fix: declare API surface's dependencies as 'api'
suztomo Oct 18, 2021
397a4fd
refactor: move java-library declaration to top-level build.gradle
suztomo Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.properties
View file
Open in desktop
Expand Up @@ -34,8 +34,8 @@ version.io_grpc=1.41.0
# 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.4.1
maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.4.1
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.27.0
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.0.0
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.2.1
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.2.1
maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0
maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.28.0
maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.28.0
Expand Down
11 changes: 8 additions & 3 deletions gax-grpc/build.gradle
View file
Open in desktop
@@ -1,18 +1,23 @@
plugins {
id 'java-library'
chanseokoh marked this conversation as resolved.
Show resolved Hide resolved
}

archivesBaseName = "gax-grpc"

// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
project.version = "2.6.1-SNAPSHOT" // {x-version-update:gax-grpc:current}

dependencies {
implementation( project(':gax'),
libraries['maven.io_grpc_grpc_stub'],
api (project(':gax'),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least gax's StatusCode is exposed as API surface.

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java

Line 301 in 0fe20f3

public Set<StatusCode.Code> getRetryableCodes() {

libraries['maven.com_google_auth_google_auth_library_credentials'])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

com.google.auth.Credentials is part of API surface

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java

Line 158 in 0fe20f3

public GrpcCallContext withCredentials(Credentials newCredentials) {


implementation(libraries['maven.io_grpc_grpc_stub'],
libraries['maven.io_grpc_grpc_auth'],
libraries['maven.io_grpc_grpc_protobuf'],
libraries['maven.com_google_guava_guava'],
libraries['maven.com_google_code_findbugs_jsr305'],
libraries['maven.org_threeten_threetenbp'],
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
libraries['maven.com_google_auth_google_auth_library_credentials'],
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
libraries['maven.com_google_api_api_common'],
libraries['maven.io_grpc_grpc_netty_shaded'],
Expand Down
11 changes: 8 additions & 3 deletions gax-httpjson/build.gradle
View file
Open in desktop
@@ -1,11 +1,17 @@
plugins {
id 'java-library'
}

archivesBaseName = "gax-httpjson"

// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
project.version = "0.91.1-SNAPSHOT" // {x-version-update:gax-httpjson:current}

dependencies {
implementation( project(':gax'),
libraries['maven.com_google_protobuf'],
api ( project(':gax'),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least gax's StatusCode is exposed as API surface.

gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java

Line 351 in 0fe20f3

public Set<StatusCode.Code> getRetryableCodes() {

libraries['maven.com_google_auth_google_auth_library_credentials'])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

com.google.auth.Credentials is part of API surface.

gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java

Line 327 in 0fe20f3

public Credentials getCredentials() {


implementation( libraries['maven.com_google_protobuf'],
libraries['maven.com_google_protobuf_java_util'],
libraries['maven.com_google_code_gson_gson'],
libraries['maven.com_google_guava_guava'],
Expand All @@ -14,7 +20,6 @@ dependencies {
libraries['maven.com_google_http_client_google_http_client'],
libraries['maven.com_google_http_client_google_http_client_gson'],
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
libraries['maven.com_google_auth_google_auth_library_credentials'],
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
libraries['maven.com_google_api_api_common'])

Expand Down
6 changes: 6 additions & 0 deletions gax/build.gradle
View file
Open in desktop
@@ -1,9 +1,15 @@
plugins {
id 'java-library'
}

archivesBaseName = "gax"

// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
project.version = "2.6.1-SNAPSHOT" // {x-version-update:gax:current}

dependencies {
api libraries['maven.com_google_auth_google_auth_library_credentials']
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

com.google.auth.Credentials is part of API surface #1534 (comment)

Screen Shot 2021-10-15 at 10 53 38 PM


implementation (libraries['maven.com_google_guava_guava'],
libraries['maven.com_google_code_findbugs_jsr305'],
libraries['maven.org_threeten_threetenbp'],
Expand Down