Skip to content

Commit 220b97b

Browse files
chanseokohchanseokoh
authored
Merge branch 'main' into renovate/codecov-codecov-action-2.x
2 parents b680bae + 99b3da7 commit 220b97b

86 files changed

Lines changed: 2226 additions & 839 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.githooks/pre-commit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fi
8383
if [ $NUM_JAVA_FILES_CHANGED -gt 0 ]
8484
then
8585
echo_status "Running Java linter..."
86-
bazel --batch build --disk_cache="$BAZEL_CACHE_DIR" //:google_java_format_verification
86+
bazel --batch run --disk_cache="$BAZEL_CACHE_DIR" //:google_java_format_verification
8787
FORMAT_STATUS=$?
8888
if [ $FORMAT_STATUS != 0 ]
8989
then

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
retention-days: 5
7474

7575
- name: Java Linter
76-
run: bazel --batch build //:google_java_format_verification
76+
run: bazel --batch run //:google_java_format_verification
7777

7878
coverage:
7979
runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Generate Code Coverage Report
8888
# Run only test targets, and not golden_update targets.
89-
run: bazel coverage $(bazel query "src/test/..." | grep "Test$") --combined_report=lcov
89+
run: bazel coverage $(bazel query "src/test/..." | grep "Test$") --combined_report=lcov
9090

9191
- name: Upload Code Coverage Report
9292
uses: codecov/codecov-action@v2

‎BUILD.bazel‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,7 @@
11
load("@rules_java//java:defs.bzl", "java_binary", "java_proto_library")
2-
load(
3-
"//:gapic_generator_java.bzl",
4-
"google_java_format",
5-
"google_java_format_verification",
6-
)
72

83
package(default_visibility = ["//visibility:public"])
94

10-
JAVA_SRCS = [
11-
"//src/main/java/com/google/api/generator/debug:debug_files",
12-
"//src/main/java/com/google/api/generator:generator_files",
13-
"//src/main/java/com/google/api/generator/engine:engine_files",
14-
"//src/main/java/com/google/api/generator/gapic:gapic_files",
15-
"//src/main/java/com/google/api/generator/util:util_files",
16-
]
17-
18-
TEST_SRCS = [
19-
"//src/test/java/com/google/api/generator/engine:engine_files",
20-
"//src/test/java/com/google/api/generator/gapic:gapic_files",
21-
"//src/test/java/com/google/api/generator/testutils:testutils_files",
22-
"//src/test/java/com/google/api/generator/util:util_files",
23-
"//src/test/java/com/google/api/generator/test/framework:framework_files",
24-
]
25-
265
# ============= Proto wrappers =================
276

287
java_proto_library(
@@ -104,21 +83,25 @@ java_binary(
10483
name = "google_java_format_binary",
10584
jvm_flags = ["-Xmx512m"],
10685
main_class = "com.google.googlejavaformat.java.Main",
107-
visibility = ["//visibility:public"],
10886
runtime_deps = ["@google_java_format_all_deps//jar"],
10987
)
11088

89+
genrule(
90+
name = "google_java_format",
91+
outs = ["google_java_format.sh"],
92+
cmd = "echo 'find src test -name \'*.java\' | grep -v /goldens/ | xargs $(execpath :google_java_format_binary) --replace' > $(OUTS)",
93+
executable = 1,
94+
tools = [":google_java_format_binary"],
95+
local = 1,
96+
)
97+
11198
# Run `bazel build //:google_java_format_verification` to verify that gapic-generator-java sources
11299
# are formatted correctly.
113-
google_java_format_verification(
100+
genrule(
114101
name = "google_java_format_verification",
115-
srcs = JAVA_SRCS + TEST_SRCS,
116-
formatter = "//:google_java_format_binary",
117-
)
118-
119-
# Run `bazel run //:google_java_format` to format gapic-generator-java sources.
120-
google_java_format(
121-
name = "google_java_format",
122-
srcs = JAVA_SRCS + TEST_SRCS,
123-
formatter = "//:google_java_format_binary",
102+
outs = ["google_java_format_verification.sh"],
103+
cmd = "echo 'find src test -name \'*.java\' | grep -v /goldens/ | xargs $(execpath :google_java_format_binary) --dry-run --set-exit-if-changed' > $(OUTS)",
104+
executable = 1,
105+
tools = [":google_java_format_binary"],
106+
local = 1,
124107
)

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## [2.6.0](https://github.com/googleapis/gapic-generator-java/compare/v2.5.0...v2.6.0) (2022-01-28)
4+
5+
6+
### Features
7+
8+
* Support explicit dynamic routing header ([#887](https://github.com/googleapis/gapic-generator-java/issues/887)) ([bcc1bdb](https://github.com/googleapis/gapic-generator-java/commit/bcc1bdb5fdf57d8843a03318d746df7d8392d848))
9+
10+
11+
### Bug Fixes
12+
13+
* increase default memory for Gradle builds on generated libraries ([#907](https://github.com/googleapis/gapic-generator-java/issues/907)) ([d210aa1](https://github.com/googleapis/gapic-generator-java/commit/d210aa193d45ba5fbdea6ae5f31e471401c27cb7))
14+
315
## [2.5.0](https://github.com/googleapis/gapic-generator-java/compare/v2.4.1...v2.5.0) (2022-01-22)
416

517

‎DEVELOPMENT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
- Run linter checks without actually doing the formatting.
9191

9292
```sh
93-
bazel build :google_java_format_verification
93+
bazel run :google_java_format_verification
9494
```
9595

9696
- Format files.

‎PROPERTIES.bzl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
PROPERTIES = {
2+
"version.com_google_protobuf": "3.19.1",
3+
# Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8.
4+
"version.google_java_format": "1.7",
5+
"version.com_google_api_common_java": "1.9.3",
6+
"version.io_grpc_java": "1.42.1",
7+
8+
# Common deps.
9+
"maven.com_google_guava_guava": "com.google.guava:guava:30.1-android",
10+
"maven.com_google_code_findbugs_jsr305": "com.google.code.findbugs:jsr305:3.0.0",
11+
"maven.com_google_auto_value_auto_value": "com.google.auto.value:auto-value:1.7.2",
12+
"maven.com_google_auto_value_auto_value_annotations": "com.google.auto.value:auto-value-annotations:1.7.2",
13+
"maven.com_google_code_gson": "com.google.code.gson:gson:2.8.6",
14+
"maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.19.1",
15+
"maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.0",
16+
"maven.javax_annotation_javax_annotation_api": "javax.annotation:javax.annotation-api:1.3.2",
17+
"maven.javax_validation_javax_validation_api": "javax.validation:validation-api:2.0.1.Final",
18+
19+
# Gapic YAML parsing for batching settings.
20+
"maven.org_yaml_snakeyaml": "org.yaml:snakeyaml:1.26",
21+
22+
# ServiceStubSettings class. Used only in generated code.
23+
"maven.org_threeten_threetenbp": "org.threeten:threetenbp:1.3.3",
24+
25+
# Testing.
26+
"maven.junit_junit": "junit:junit:4.13.1",
27+
# This hamcrest-core dependency is for running JUnit test manually, before JUnit 4.11 it's wrapped along with JUnit package.
28+
# But now it has to be explicitly added.
29+
"maven.org_hamcrest_hamcrest_core": "org.hamcrest:hamcrest-core:1.3",
30+
"maven.org_mockito_mockito_core": "org.mockito:mockito-core:2.21.0",
31+
# Keep in sync with gax-java.
32+
"maven.com_google_truth_truth": "com.google.truth:truth:1.1.2",
33+
}

‎WORKSPACE‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jvm_maven_import_external(
3333
# which in its turn, prioritizes actual generated clients runtime dependencies
3434
# over the generator dependencies.
3535

36-
_gax_java_version = "2.10.0"
36+
_gax_java_version = "2.11.0"
3737

3838
http_archive(
3939
name = "com_google_api_gax_java",
@@ -52,14 +52,6 @@ load("@com_google_api_gax_java//:repositories.bzl", "com_google_api_gax_java_rep
5252

5353
com_google_api_gax_java_repositories()
5454

55-
load("//:repository_rules.bzl", "gapic_generator_java_properties")
56-
57-
gapic_generator_java_properties(
58-
name = "gapic_generator_java_properties",
59-
file = "//:dependencies.properties",
60-
)
61-
62-
load("@gapic_generator_java_properties//:dependencies.properties.bzl", "PROPERTIES")
6355
load("//:repositories.bzl", "gapic_generator_java_repositories")
6456

6557
gapic_generator_java_repositories()

‎dependencies.properties‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎gapic_generator_java.bzl‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎repositories.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
1616
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1717
load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
18-
load("@gapic_generator_java_properties//:dependencies.properties.bzl", "PROPERTIES")
18+
load("//:PROPERTIES.bzl", "PROPERTIES")
1919

2020
def gapic_generator_java_repositories():
2121
# Import dependencies shared between Gradle and Bazel (i.e. maven dependencies)

0 commit comments

Comments
 (0)