Merge 45b158a into 2326592

firebase · Sep 19, 2024 · 6f46f8b · 6f46f8b
2 parents 2326592 + 45b158a
commit 6f46f8b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 995 deletions.
diff --git a/...ebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt b/...ebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt
@@ -25,7 +25,7 @@ import com.google.firebase.testing.LinkedListProto
 import com.google.firebase.testing.SimpleProto
 import com.google.firebase.testing.Types
 import com.google.protobuf.Descriptors.FileDescriptor
-import com.google.protobuf.GeneratedMessageV3
+import com.google.protobuf.GeneratedMessage
 import com.google.protobuf.Timestamp
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -153,7 +153,7 @@ class ParsingTests {
 
 private fun parse(
   vararg files: FileDescriptor,
-  include: List<GeneratedMessageV3> = listOf()
+  include: List<GeneratedMessage> = listOf()
 ): List<UserDefined> {
   return DefaultParser(
       CodeGenConfig.newBuilder()

diff --git a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
@@ -51,7 +51,7 @@ dependencies {
 
     testImplementation project(":encoders:firebase-encoders")
     testImplementation project(":encoders:firebase-encoders-proto")
-    testImplementation "com.google.protobuf:protobuf-java:3.21.9"
+    testImplementation libs.protobuf.java
     testImplementation "com.google.truth:truth:1.0.1"
     testImplementation 'junit:junit:4.13.1'
 }
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -104,7 +104,7 @@ dependencies {
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.junit)
     androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
-    androidTestImplementation("com.google.protobuf:protobuf-java:3.21.11")
+    androidTestImplementation(libs.protobuf.java)
     androidTestImplementation(libs.truth)
     androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
     androidTestImplementation(libs.mockito.dexmaker)

diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
@@ -112,7 +112,7 @@ dependencies {
     implementation 'com.google.dagger:dagger:2.27'
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
-    api 'com.google.firebase:protolite-well-known-types:18.0.0'
+    api project(':protolite-well-known-types')
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     api("com.google.firebase:firebase-common:21.0.0")
     api("com.google.firebase:firebase-common-ktx:21.0.0")
@@ -130,7 +130,7 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
      }
-    testCompileOnly "com.google.protobuf:protobuf-java:3.21.9"
+    testCompileOnly libs.protobuf.java
     testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

diff --git a/firebase-perf/ktx/ktx.gradle b/firebase-perf/ktx/ktx.gradle
@@ -59,5 +59,5 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    testCompileOnly "com.google.protobuf:protobuf-java:3.21.9"
+    testCompileOnly libs.protobuf.java
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,10 +6,11 @@ autovalue = "1.10.1"
 coroutines = "1.6.4"
 dagger = "2.43.2"
 grpc = "1.62.2"
-javalite = "3.21.11"
+javalite = "4.28.1"
 kotlin = "1.8.22"
+protobuf-java = "3.21.9"
 serialization-plugin = "1.8.22"
-protoc = "3.21.11"
+protoc = "4.28.1"
 truth = "1.4.2"
 robolectric = "4.12"
 protobufjavautil = "3.21.11"

diff --git a/protolite-well-known-types/fix-javalite/proto/google/protobuf/duration.proto b/protolite-well-known-types/fix-javalite/proto/google/protobuf/duration.proto
diff --git a/protolite-well-known-types/gradle.properties b/protolite-well-known-types/gradle.properties
@@ -1,5 +1,5 @@
 # IMPORTANT (b/285892320) Keep version and latestReleasedVersion in sync 
 # unless you are releasing a new version of the library to prevent issues 
 # with transitive dependencies.
-version=18.0.0
+version=18.0.1
 latestReleasedVersion=18.0.0
diff --git a/protolite-well-known-types/protolite-well-known-types.gradle b/protolite-well-known-types/protolite-well-known-types.gradle
@@ -31,7 +31,7 @@ protobuf {
     generateProtoTasks {
         all().each { task ->
 
-            task.addIncludeDir(files('fix-javalite/proto'))
+            // task.addIncludeDir(files('fix-javalite/proto'))
 
             task.builtins {
                 java {
@@ -64,7 +64,7 @@ android {
 
 
 dependencies {
-    protobuf("com.google.api.grpc:proto-google-common-protos:1.18.0"){
+    protobuf("com.google.api.grpc:proto-google-common-protos:2.17.0"){
         exclude group: "com.google.protobuf", module: "protobuf-java"
     }