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

Commit 8794b5c

Browse files
suztomosuztomo
authored
fix: declare depenencies of API surfaces as api (#1535) (#1536)
* deps: declaring the latest auth library version * fix: declare API surface as api configuration Fix #1534 * fix: declare API surface's dependencies as 'api' Adding more artifacts to be declared as 'api' because they appear in public API surface. See the comment of the following issue for the analysis: #1534 * refactor: move java-library declaration to top-level build.gradle
1 parent 48aa4a7 commit 8794b5c

5 files changed

Lines changed: 35 additions & 29 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
3737
}
3838

3939
subprojects {
40-
apply plugin: 'java'
40+
apply plugin: 'java-library'
4141
apply plugin: 'eclipse'
4242
apply plugin: 'idea'
4343
apply plugin: 'jacoco'
@@ -109,6 +109,7 @@ subprojects {
109109
'maven.io_grpc_grpc_core': "io.grpc:grpc-core:${libraries['version.io_grpc']}",
110110
'maven.io_grpc_grpc_context': "io.grpc:grpc-context:${libraries['version.io_grpc']}",
111111
'maven.io_grpc_grpc_stub': "io.grpc:grpc-stub:${libraries['version.io_grpc']}",
112+
'maven.io_grpc_grpc_api': "io.grpc:grpc-api:${libraries['version.io_grpc']}",
112113
'maven.io_grpc_grpc_auth': "io.grpc:grpc-auth:${libraries['version.io_grpc']}",
113114
'maven.io_grpc_grpc_protobuf': "io.grpc:grpc-protobuf:${libraries['version.io_grpc']}",
114115
'maven.io_grpc_grpc_netty_shaded': "io.grpc:grpc-netty-shaded:${libraries['version.io_grpc']}",

‎dependencies.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ version.io_grpc=1.41.0
3434
# 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
3535
maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.4.1
3636
maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.4.1
37-
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.27.0
38-
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.0.0
37+
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.2.1
38+
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.2.1
3939
maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0
4040
maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.28.0
4141
maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.28.0

‎gax-grpc/build.gradle‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ archivesBaseName = "gax-grpc"
44
project.version = "2.6.1-SNAPSHOT" // {x-version-update:gax-grpc:current}
55

66
dependencies {
7-
implementation( project(':gax'),
8-
libraries['maven.io_grpc_grpc_stub'],
9-
libraries['maven.io_grpc_grpc_auth'],
10-
libraries['maven.io_grpc_grpc_protobuf'],
7+
api(project(':gax'),
8+
libraries['maven.com_google_api_api_common'],
9+
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
10+
libraries['maven.com_google_auth_google_auth_library_credentials'],
1111
libraries['maven.com_google_guava_guava'],
12+
libraries['maven.io_grpc_grpc_api'],
13+
libraries['maven.org_threeten_threetenbp'])
14+
15+
implementation(libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
1216
libraries['maven.com_google_code_findbugs_jsr305'],
13-
libraries['maven.org_threeten_threetenbp'],
14-
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
15-
libraries['maven.com_google_auth_google_auth_library_credentials'],
16-
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
17-
libraries['maven.com_google_api_api_common'],
17+
libraries['maven.io_grpc_grpc_alts'],
18+
libraries['maven.io_grpc_grpc_auth'],
1819
libraries['maven.io_grpc_grpc_netty_shaded'],
19-
libraries['maven.io_grpc_grpc_alts'])
20+
libraries['maven.io_grpc_grpc_protobuf'],
21+
libraries['maven.io_grpc_grpc_stub'])
2022

2123
compileOnly libraries['maven.com_google_auto_value_auto_value']
2224

‎gax-httpjson/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@ archivesBaseName = "gax-httpjson"
44
project.version = "0.91.1-SNAPSHOT" // {x-version-update:gax-httpjson:current}
55

66
dependencies {
7-
implementation( project(':gax'),
8-
libraries['maven.com_google_protobuf'],
9-
libraries['maven.com_google_protobuf_java_util'],
7+
api(project(':gax'),
8+
libraries['maven.com_google_api_api_common'],
9+
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
10+
libraries['maven.com_google_auth_google_auth_library_credentials'],
1011
libraries['maven.com_google_code_gson_gson'],
1112
libraries['maven.com_google_guava_guava'],
12-
libraries['maven.com_google_code_findbugs_jsr305'],
13-
libraries['maven.org_threeten_threetenbp'],
1413
libraries['maven.com_google_http_client_google_http_client'],
14+
libraries['maven.com_google_protobuf'],
15+
libraries['maven.org_threeten_threetenbp'])
16+
17+
implementation(libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
18+
libraries['maven.com_google_code_findbugs_jsr305'],
1519
libraries['maven.com_google_http_client_google_http_client_gson'],
16-
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
17-
libraries['maven.com_google_auth_google_auth_library_credentials'],
18-
libraries['maven.com_google_api_grpc_proto_google_common_protos'],
19-
libraries['maven.com_google_api_api_common'])
20+
libraries['maven.com_google_protobuf_java_util'])
2021

2122
compileOnly libraries['maven.com_google_auto_value_auto_value']
2223

23-
testImplementation( project(':gax').sourceSets.test.output,
24+
testImplementation(project(':gax').sourceSets.test.output,
2425
libraries['maven.junit_junit'],
2526
libraries['maven.org_mockito_mockito_core'],
2627
libraries['maven.com_google_truth_truth'])

‎gax/build.gradle‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ archivesBaseName = "gax"
44
project.version = "2.6.1-SNAPSHOT" // {x-version-update:gax:current}
55

66
dependencies {
7-
implementation (libraries['maven.com_google_guava_guava'],
7+
api(libraries['maven.com_google_api_api_common'],
8+
libraries['maven.com_google_auth_google_auth_library_credentials'],
9+
libraries['maven.org_threeten_threetenbp'])
10+
11+
implementation(libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
812
libraries['maven.com_google_code_findbugs_jsr305'],
9-
libraries['maven.org_threeten_threetenbp'],
10-
libraries['maven.com_google_auth_google_auth_library_oauth2_http'],
11-
libraries['maven.com_google_api_api_common'],
13+
libraries['maven.com_google_guava_guava'],
1214
libraries['maven.io_opencensus_opencensus_api'])
1315

1416
compileOnly libraries['maven.com_google_auto_value_auto_value']
1517

16-
testImplementation( libraries['maven.junit_junit'],
18+
testImplementation(libraries['maven.junit_junit'],
1719
libraries['maven.org_mockito_mockito_core'],
1820
libraries['maven.com_google_truth_truth'],
19-
libraries['maven.com_google_auto_value_auto_value'] )
21+
libraries['maven.com_google_auto_value_auto_value'])
2022

2123
annotationProcessor libraries['maven.com_google_auto_value_auto_value']
2224
testAnnotationProcessor libraries['maven.com_google_auto_value_auto_value']

0 commit comments

Comments
 (0)