Cherry pick #1425 - protobuf lite into 0.29.x (#1441)

google · Jul 26, 2024 · cd9a8de · cd9a8de
1 parent 2cf118c
commit cd9a8de
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 73 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -35,6 +35,7 @@ publishing {
         }
     }
 }
+
 /**
  * Serde gen task
  *
@@ -103,12 +104,18 @@ project.sourceSets.main { proto { srcDir(rootProject.layout.projectDirectory.dir
 
 protobuf {
     protoc { artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" }
-    generateProtoTasks { all().forEach { it.builtins { id("kotlin") } } }
+    generateProtoTasks {
+        all().forEach {
+            it.builtins {
+                get("java").option("lite")
+                id("kotlin") { option("lite") }
+            }
+        }
+    }
 }
 
 dependencies {
     api(libs.javax.annotationApi)
     implementation(libs.kotlin.stdlib)
-    implementation(libs.protobuf.kotlin)
-    api(libs.protobuf.java.util)
+    implementation(libs.protobuf.kotlin.lite)
 }
diff --git a/designcompose/build.gradle.kts b/designcompose/build.gradle.kts
@@ -118,7 +118,7 @@ dependencies {
     implementation(libs.guavaAndroid)
     implementation(libs.androidx.tracing.ktx)
     implementation(libs.androidx.compose.runtime.tracing)
-    implementation(libs.protobuf.kotlin)
+    implementation(libs.protobuf.kotlin.lite)
 
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.ui.test.manifest)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -135,8 +135,7 @@ roborazzi-compose = {module = "io.github.takahirom.roborazzi:roborazzi-compose",
 roborazzi-junit = {module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi"}
 spotless-plugin-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc"}
-protobuf-kotlin = {module = "com.google.protobuf:protobuf-kotlin", version.ref = "protoc"}
-protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc"}
+protobuf-kotlin-lite = {module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protoc"}
 
 
 [plugins]

diff --git a/proto/android_interface/jni_layout.proto b/proto/android_interface/jni_layout.proto
@@ -18,9 +18,9 @@ package designcompose.android_interface;
 
 import "definition/layout/layout_node.proto";
 
-option java_package = "com.android.designcompose.android_interface";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.android_interface";
+option optimize_for = LITE_RUNTIME;
 
 // A list of Figma nodes to register for layout
 message LayoutNodeList {

diff --git a/proto/definition/design_compose_definition.proto b/proto/definition/design_compose_definition.proto
@@ -19,9 +19,9 @@ package designcompose.definition;
 import "definition/element/variable.proto";
 import "definition/view/view.proto";
 
-option java_package = "com.android.designcompose.definition";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition";
+option optimize_for = LITE_RUNTIME;
 
 // A serialized Figma design document, containing views, images, component sets,
 // version, ID, and variable map. It's used for storing and loading Figma

diff --git a/proto/definition/element/color.proto b/proto/definition/element/color.proto
@@ -16,7 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.element;
 
+option java_multiple_files = true;
 option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // Color represents a color value within a design, encoded as RGBA (Red, Green,
 // Blue, Alpha) where each component is an 8-bit integer. Alpha determines

diff --git a/proto/definition/element/font.proto b/proto/definition/element/font.proto
@@ -18,9 +18,9 @@ package designcompose.definition.element;
 
 import "definition/element/variable.proto";
 
-option java_package = "com.android.designcompose.definition.element";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // FontWeight specifies the visual thickness of a typeface. It's represented
 // numerically, usually ranging from 100 (thin) to 900 (black). Common values

diff --git a/proto/definition/element/geometry.proto b/proto/definition/element/geometry.proto
@@ -18,9 +18,9 @@ package designcompose.definition.element;
 
 import "google/protobuf/empty.proto";
 
-option java_package = "com.android.designcompose.definition.element";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // Size encapsulates the dimensions of an element, expressed as width and height
 // values. These values typically represent pixels or density-independent pixels

diff --git a/proto/definition/element/node.proto b/proto/definition/element/node.proto
@@ -16,8 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.element;
 
-option java_package = "com.android.designcompose.definition.element";
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // A message used to identify a specific node within a design document. It
 // supports different ways to specify the node, including by its ID, name,

diff --git a/proto/definition/element/path.proto b/proto/definition/element/path.proto
@@ -19,8 +19,8 @@ package designcompose.definition.element;
 import "definition/modifier/background.proto";
 
 option java_package = "com.android.designcompose.definition.element";
-
 option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
 
 // Path represents a complex shape in a design, defined by a series of commands
 // (e.g., move, line, curve) and associated numerical data. It determines the

diff --git a/proto/definition/element/variable.proto b/proto/definition/element/variable.proto
@@ -18,9 +18,9 @@ package designcompose.definition.element;
 
 import "definition/element/color.proto";
 
-option java_package = "com.android.designcompose.definition.element";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // Holds the value of a variable, whichever type it is.
 message VariableValue {

diff --git a/proto/definition/element/view_shape.proto b/proto/definition/element/view_shape.proto
@@ -18,9 +18,9 @@ package designcompose.definition.element;
 
 import "definition/element/variable.proto";
 
-option java_package = "com.android.designcompose.definition.element";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.element";
+option optimize_for = LITE_RUNTIME;
 
 // Represents the geometric shape of a visual element, such as a rectangle,
 //  ellipse, or a custom path. It determines the boundaries of the element and

diff --git a/proto/definition/interaction/pointer.proto b/proto/definition/interaction/pointer.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.interaction;
 
-option java_package = "com.android.designcompose.definition.interaction";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.interaction";
+option optimize_for = LITE_RUNTIME;
 
 // Determines how a UI element responds to user interactions like taps, clicks,
 // and hovers. It can be set to "Auto" for default behavior, "None" to disable

diff --git a/proto/definition/interaction/reaction.proto b/proto/definition/interaction/reaction.proto
@@ -20,7 +20,9 @@ import "definition/element/geometry.proto";
 import "definition/interaction/transition.proto";
 import "google/protobuf/empty.proto";
 
+option java_multiple_files = true;
 option java_package = "com.android.designcompose.definition.interaction";
+option optimize_for = LITE_RUNTIME;
 
 // Various actions that can be triggered
 message Action {

diff --git a/proto/definition/interaction/transition.proto b/proto/definition/interaction/transition.proto
@@ -19,9 +19,9 @@ syntax = "proto3";
 
 package designcompose.definition.interaction;
 
-option java_package = "com.android.designcompose.definition.interaction";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.interaction";
+option optimize_for = LITE_RUNTIME;
 
 // The type of easing to perform in a transition.
 message Easing {

diff --git a/proto/definition/layout/display.proto b/proto/definition/layout/display.proto
@@ -16,8 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.layout;
 
-option java_package = "com.android.designcompose.definition.layout";
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.layout";
+option optimize_for = LITE_RUNTIME;
 
 // Configures whether a view is displayed using a Flexbox layout or not at all.
 enum Display {

diff --git a/proto/definition/layout/grid.proto b/proto/definition/layout/grid.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.layout;
 
-option java_package = "com.android.designcompose.definition.layout";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.layout";
+option optimize_for = LITE_RUNTIME;
 
 // Represents a span for a node within a grid layout.
 message GridSpan {

diff --git a/proto/definition/layout/layout_node.proto b/proto/definition/layout/layout_node.proto
@@ -18,9 +18,9 @@ package designcompose.definition.layout;
 
 import "definition/layout/layout_style.proto";
 
-option java_package = "com.android.designcompose.definition.layout";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.layout";
+option optimize_for = LITE_RUNTIME;
 
 // A representation of a Figma node to register for layout.
 message LayoutNode {

diff --git a/proto/definition/layout/layout_style.proto b/proto/definition/layout/layout_style.proto
@@ -20,9 +20,9 @@ import "definition/element/geometry.proto";
 import "definition/layout/grid.proto";
 import "definition/layout/positioning.proto";
 
-option java_package = "com.android.designcompose.definition.layout";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.layout";
+option optimize_for = LITE_RUNTIME;
 
 /* This message defines the layout style of a Figma node. It includes various
  * properties that control the node's position, size, and spacing, as well as

diff --git a/proto/definition/layout/positioning.proto b/proto/definition/layout/positioning.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.layout;
 
-option java_package = "com.android.designcompose.definition.layout";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.layout";
+option optimize_for = LITE_RUNTIME;
 
 // Controls how items are aligned on the cross axis within a single line (row or
 // column) of the container. The cross axis is the axis perpendicular to the

diff --git a/proto/definition/modifier/background.proto b/proto/definition/modifier/background.proto
@@ -20,9 +20,9 @@ import "definition/element/color.proto";
 import "definition/modifier/filter.proto";
 import "definition/modifier/matrix_transform.proto";
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // The background of a node
 message Background {

diff --git a/proto/definition/modifier/blend.proto b/proto/definition/modifier/blend.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.modifier;
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // Various supported Blend types
 enum BlendMode {

diff --git a/proto/definition/modifier/filter.proto b/proto/definition/modifier/filter.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.modifier;
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // Various filters that can be applied and their intensity
 message FilterOp {

diff --git a/proto/definition/modifier/matrix_transform.proto b/proto/definition/modifier/matrix_transform.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.modifier;
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // Represents a 3D affine transformation, which is a combination of
 // translation, rotation, scaling, and shearing in 3D space. It's used to

diff --git a/proto/definition/modifier/shadow.proto b/proto/definition/modifier/shadow.proto
@@ -18,9 +18,9 @@ package designcompose.definition.modifier;
 
 import "definition/element/color.proto";
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // Shadows can be applied to the border box, or the stroke box.
 //

diff --git a/proto/definition/modifier/text.proto b/proto/definition/modifier/text.proto
@@ -18,9 +18,9 @@ package designcompose.definition.modifier;
 
 import "definition/element/color.proto";
 
-option java_package = "com.android.designcompose.definition.modifier";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.modifier";
+option optimize_for = LITE_RUNTIME;
 
 // Horizontal text alignment. This value aligns the text within its bounds.
 enum TextAlign {

diff --git a/proto/definition/plugin/frame_extras.proto b/proto/definition/plugin/frame_extras.proto
@@ -18,9 +18,9 @@ package designcompose.definition.plugin;
 
 import "definition/element/color.proto";
 
-option java_package = "com.android.designcompose.definition.plugin";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.plugin";
+option optimize_for = LITE_RUNTIME;
 
 // Some frame properties are only available through the plugin API and are
 // needed to implement Reactions properly. They're included in this FrameExtras

diff --git a/proto/definition/plugin/meter_data.proto b/proto/definition/plugin/meter_data.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package designcompose.definition.plugin;
 
-option java_package = "com.android.designcompose.definition.plugin";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.plugin";
+option optimize_for = LITE_RUNTIME;
 
 // Represents data for a rotation meter, including whether it's enabled, its
 // start and end angles, whether it's discrete, and the discrete value.

diff --git a/proto/definition/view/component.proto b/proto/definition/view/component.proto
@@ -20,9 +20,9 @@ import "definition/view/text_style.proto";
 import "definition/view/view_style.proto";
 import "google/protobuf/empty.proto";
 
-option java_package = "com.android.designcompose.definition.view";
-
 option java_multiple_files = true;
+option java_package = "com.android.designcompose.definition.view";
+option optimize_for = LITE_RUNTIME;
 
 // Figma component properties can be "overridden" in the UI. These overrides
 // are applied in the node tree we get back from Figma, so we don't have to

diff --git a/proto/definition/view/node_style.proto b/proto/definition/view/node_style.proto
@@ -30,9 +30,10 @@ import "definition/modifier/shadow.proto";
 import "definition/modifier/text.proto";
 import "definition/plugin/meter_data.proto";
 
+option java_multiple_files = true;
 option java_package = "com.android.designcompose.definition.view";
+option optimize_for = LITE_RUNTIME;
 
-option java_multiple_files = true;
 
 // Contains all of the styleable parameters accepted by the Rect and Text
 // components.