Skip to content
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

feat: add libraries_bom_version in metadata #1956

Merged
merged 9 commits into from
Apr 15, 2024
Merged

feat: add libraries_bom_version in metadata #1956

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ef9c08
feat: add libraries_bom_version
JoeWang1127 Apr 15, 2024
a5f2634
add unit tests
JoeWang1127 Apr 15, 2024
0cdfe5c
remove isfile
JoeWang1127 Apr 15, 2024
0452103
add tempdir
JoeWang1127 Apr 15, 2024
1eefbc5
restore
JoeWang1127 Apr 15, 2024
67e49f2
add current dir
JoeWang1127 Apr 15, 2024
500cbfe
restore template
JoeWang1127 Apr 15, 2024
826d2a6
remove unit test
JoeWang1127 Apr 15, 2024
b7415ef
restore templates
JoeWang1127 Apr 15, 2024
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
6 changes: 5 additions & 1 deletion synthtool/languages/java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
\\*/
"""
DEFAULT_MIN_SUPPORTED_JAVA_VERSION = 8
METADATA = "metadata"
LIBRARIES_BOM_VERSION = "libraries_bom_version"


def format_code(
Expand Down Expand Up @@ -490,7 +492,7 @@ def common_templates(
:param kwargs: Additional options for CommonTemplates.java_library()
"""
metadata = _common_template_metadata()
kwargs["metadata"] = metadata
kwargs[METADATA] = metadata

# Generate flat to tell this repository is a split repo that have migrated
# to monorepo. The owlbot.py in the monorepo sets monorepo=True.
Expand All @@ -499,6 +501,8 @@ def common_templates(
split_repo = not monorepo
repo_metadata = metadata["repo"]
repo_short = repo_metadata["repo_short"]
if LIBRARIES_BOM_VERSION in kwargs:
kwargs[METADATA][LIBRARIES_BOM_VERSION] = kwargs.get(LIBRARIES_BOM_VERSION)
# Special libraries that are not GAPIC_AUTO but in the monorepo
special_libs_in_monorepo = [
"java-translate",
Expand Down
Loading