Skip to content

Commit

Permalink
Update Bazel auto-value version and enable AutoBuilder.
Browse files Browse the repository at this point in the history 
Work towards starlark options parser cleanup: #22365.

PiperOrigin-RevId: 633649782
Change-Id: I73180180142b5b23e91f1ee8c845ea606cfdc85e
  • Loading branch information
@katre @copybara-github
katre authored and copybara-github committed May 14, 2024
1 parent 3c3bb45 commit 7025bb8
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 47 deletions.
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ maven.install(
"com.google.auto:auto-common:1.2.1",
"com.google.auto.service:auto-service:1.0",
"com.google.auto.service:auto-service-annotations:1.0.1",
"com.google.auto.value:auto-value:1.8.2",
"com.google.auto.value:auto-value-annotations:1.9",
"com.google.auto.value:auto-value:1.10.4",
"com.google.auto.value:auto-value-annotations:1.10.4",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.9.0",
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
Expand Down
40 changes: 20 additions & 20 deletions MODULE.bazel.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 70 additions & 22 deletions maven_install.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1536314734,
"__RESOLVED_ARTIFACTS_HASH": -1123103492,
"__INPUT_ARTIFACTS_HASH": -198606423,
"__RESOLVED_ARTIFACTS_HASH": 2062149723,
"conflict_resolution": {
"com.google.auto.value:auto-value-annotations:1.9": "com.google.auto.value:auto-value-annotations:1.10.4",
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.9.0",
"com.google.errorprone:error_prone_annotations:2.23.0": "com.google.errorprone:error_prone_annotations:2.24.1",
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.24.1",
Expand Down Expand Up @@ -98,9 +97,9 @@
},
"com.google.auto.value:auto-value": {
"shasums": {
"jar": "2067b788d4c1c96fd621ad861053a5c4d8a801cfafc77fec20d49a6e9340a745"
"jar": "f3c438d1f82904bbcb452084d488b660f3c7488e9274c3a58f049e121632d434"
},
"version": "1.8.2"
"version": "1.10.4"
},
"com.google.auto.value:auto-value-annotations": {
"shasums": {
Expand Down Expand Up @@ -1283,23 +1282,72 @@
"com.google.auto.service"
],
"com.google.auto.value:auto-value": [
"autovalue.shaded.com.google$.auto.common",
"autovalue.shaded.com.google$.auto.service",
"autovalue.shaded.com.google$.common.annotations",
"autovalue.shaded.com.google$.common.base",
"autovalue.shaded.com.google$.common.collect",
"autovalue.shaded.com.google$.common.hash",
"autovalue.shaded.com.google$.common.math",
"autovalue.shaded.com.google$.common.primitives",
"autovalue.shaded.com.google$.common.reflect",
"autovalue.shaded.com.google$.errorprone.annotations",
"autovalue.shaded.com.google$.errorprone.annotations.concurrent",
"autovalue.shaded.com.google$.escapevelocity",
"autovalue.shaded.com.google$.j2objc.annotations",
"autovalue.shaded.com.squareup.javapoet$",
"autovalue.shaded.net.ltgt.gradle.incap$",
"autovalue.shaded.org.checkerframework$.checker.nullness.qual",
"autovalue.shaded.org.checkerframework$.framework.qual",
"autovalue.shaded.com.google.auto.common",
"autovalue.shaded.com.google.auto.service",
"autovalue.shaded.com.google.common.annotations",
"autovalue.shaded.com.google.common.base",
"autovalue.shaded.com.google.common.cache",
"autovalue.shaded.com.google.common.collect",
"autovalue.shaded.com.google.common.escape",
"autovalue.shaded.com.google.common.eventbus",
"autovalue.shaded.com.google.common.graph",
"autovalue.shaded.com.google.common.hash",
"autovalue.shaded.com.google.common.html",
"autovalue.shaded.com.google.common.io",
"autovalue.shaded.com.google.common.math",
"autovalue.shaded.com.google.common.net",
"autovalue.shaded.com.google.common.primitives",
"autovalue.shaded.com.google.common.reflect",
"autovalue.shaded.com.google.common.util.concurrent",
"autovalue.shaded.com.google.common.xml",
"autovalue.shaded.com.google.errorprone.annotations",
"autovalue.shaded.com.google.errorprone.annotations.concurrent",
"autovalue.shaded.com.google.escapevelocity",
"autovalue.shaded.com.google.j2objc.annotations",
"autovalue.shaded.com.squareup.javapoet",
"autovalue.shaded.kotlin",
"autovalue.shaded.kotlin.annotation",
"autovalue.shaded.kotlin.collections",

This comment has been minimized.

Sign in to view

Copy link
@fmeum

fmeum May 14, 2024

Collaborator

@katre This is a lot of fluff, including what looks like a shaded Kotlin stdlib. It could make sense to look for a cheaper way to depend on this. How is this consumed within Google?

This comment has been minimized.

Sign in to view

Copy link
@katre

katre May 14, 2024

Author Member

That's fair, I just wanted to use @AutoBuilder without passing a flag, so grabbed the latest version. I don't know if there's a smaller version we can use (this probably explains why I had to bump up the jdk minimum version size test).

This comment has been minimized.

Sign in to view

Copy link
@fmeum

fmeum May 14, 2024

Collaborator

Would @AutoValue.Builder be good enough? It's already being used in Bzlmod, so it should work without an update.

This comment has been minimized.

Sign in to view

Copy link
@katre

katre May 15, 2024

Author Member

No: @AutoValue.Builder generates a builder for an @AutoValue class.

In 78221e1 I use it to create a builder for StarlarkOptionsParser, which shouldn't be an autovalue class.

I'll take a look and see if there's any way to trim this back down.

This comment has been minimized.

Sign in to view

Copy link
@katre

katre May 20, 2024

Author Member

Autovalue is tracking this as google/auto#1440, we'll see if they implement their plan to remove the shaded kotlib libraries.
"autovalue.shaded.kotlin.collections.builders",
"autovalue.shaded.kotlin.collections.unsigned",
"autovalue.shaded.kotlin.comparisons",
"autovalue.shaded.kotlin.contracts",
"autovalue.shaded.kotlin.coroutines",
"autovalue.shaded.kotlin.coroutines.intrinsics",
"autovalue.shaded.kotlin.coroutines.jvm.internal",
"autovalue.shaded.kotlin.enums",
"autovalue.shaded.kotlin.experimental",
"autovalue.shaded.kotlin.internal",
"autovalue.shaded.kotlin.internal.jdk7",
"autovalue.shaded.kotlin.internal.jdk8",
"autovalue.shaded.kotlin.jvm",
"autovalue.shaded.kotlin.jvm.functions",
"autovalue.shaded.kotlin.jvm.internal",
"autovalue.shaded.kotlin.jvm.internal.markers",
"autovalue.shaded.kotlin.random",
"autovalue.shaded.kotlin.random.jdk8",
"autovalue.shaded.kotlin.ranges",
"autovalue.shaded.kotlin.reflect",
"autovalue.shaded.kotlin.sequences",
"autovalue.shaded.kotlin.text",
"autovalue.shaded.kotlinx.metadata",
"autovalue.shaded.kotlinx.metadata.internal",
"autovalue.shaded.kotlinx.metadata.internal.common",
"autovalue.shaded.kotlinx.metadata.internal.extensions",
"autovalue.shaded.kotlinx.metadata.internal.metadata",
"autovalue.shaded.kotlinx.metadata.internal.metadata.deserialization",
"autovalue.shaded.kotlinx.metadata.internal.metadata.jvm",
"autovalue.shaded.kotlinx.metadata.internal.metadata.jvm.deserialization",
"autovalue.shaded.kotlinx.metadata.internal.metadata.jvm.serialization",
"autovalue.shaded.kotlinx.metadata.internal.metadata.serialization",
"autovalue.shaded.kotlinx.metadata.internal.protobuf",
"autovalue.shaded.kotlinx.metadata.jvm",
"autovalue.shaded.kotlinx.metadata.jvm.internal",
"autovalue.shaded.net.ltgt.gradle.incap",
"autovalue.shaded.org.checkerframework.checker.nullness.qual",
"autovalue.shaded.org.checkerframework.framework.qual",
"autovalue.shaded.org.jetbrains.annotations",
"autovalue.shaded.org.objectweb.asm",
"com.google.auto.value.extension",
"com.google.auto.value.extension.memoized.processor",
"com.google.auto.value.extension.serializable.processor",
Expand Down
6 changes: 3 additions & 3 deletions src/test/shell/integration/minimal_jdk_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ export BAZEL_SUFFIX="_jdk_minimal"
source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }

# Bazel's install base is < 465MB with minimal JDK and > 465MB with an all
# Bazel's install base is < 480MB with minimal JDK and > 480MB with an all
# modules JDK.
function test_size_less_than_465MB() {
function test_size_less_than_480MB() {
bazel info
ib=$(bazel info install_base)
size=$(du -s "$ib" | cut -d\ -f1)
maxsize=$((1024*465))
maxsize=$((1024*480))
if [ $size -gt $maxsize ]; then
echo "$ib was too big:" 1>&2
du -a "$ib" 1>&2
Expand Down
15 changes: 15 additions & 0 deletions third_party/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,20 @@ java_plugin(
],
)

java_plugin(
name = "auto_builder_plugin",
processor_class = "com.google.auto.value.processor.AutoBuilderProcessor",
deps = [
":apache_commons_collections",
":apache_velocity",
":auto_common",
":auto_service_lib",
":auto_value_value",
":guava",
":tomcat_annotations_api",
],
)

java_plugin(
name = "auto_value_gson_plugin",
processor_class = "com.ryanharter.auto.value.gson.factory.AutoValueGsonAdapterFactoryProcessor",
Expand All @@ -227,6 +241,7 @@ java_library(
name = "auto_value",
exported_plugins = [
":auto_annotation_plugin",
":auto_builder_plugin",
":auto_oneof_plugin",
":auto_value_plugin",
":auto_value_gson_plugin",
Expand Down

0 comments on commit 7025bb8

Please sign in to comment.