Skip to content

Commit dcb3cb0

Browse files
daymxntejasd
authored andcommitted
Bump well known types (#6716)
Per [b/398840288](https://b.corp.google.com/issues/398840288), This bumps `protolite-well-known-types` to properly utilize `3.25.5`. It seems as though this was an oversight in #6343, but since gradle uses the highest version when resolving dependency conflicts (and all the existing libraries already use `3.25.5`), this isn't a major issue. This is only really an issue if someone is using `protolite-well-known-types` in isolation (which isn't really a use-case we're shipping for). But the main reason for fixing this is that it causes a bit of confusion when trying to track dependency issues (see issue #6674 for an example of this). Fixes #6674
1 parent feeeed6 commit dcb3cb0

File tree

9 files changed

+12
-7
lines changed

9 files changed

+12
-7
lines changed

firebase-firestore/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
23

34

45
# 25.1.2

firebase-inappmessaging-display/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
23

34

45
# 21.0.1

firebase-inappmessaging/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
23

34

45
# 21.0.1

firebase-perf/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716]
23

34

45
# 21.0.4

firebase-perf/firebase-perf.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ dependencies {
111111
implementation libs.dagger.dagger
112112
api 'com.google.firebase:firebase-annotations:16.2.0'
113113
api 'com.google.firebase:firebase-installations-interop:17.1.0'
114-
api 'com.google.firebase:protolite-well-known-types:18.0.0'
114+
api project(":protolite-well-known-types")
115115
implementation libs.okhttp
116116
api("com.google.firebase:firebase-common:21.0.0")
117117
api("com.google.firebase:firebase-common-ktx:21.0.0")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Unreleased
2-
2+
* [changed] Updated protobuf dependency to `3.25.5` to fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
33

protolite-well-known-types/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ android {
7373
}
7474
7575
dependencies {
76-
implementation 'com.google.firebase:protolite-well-known-types:18.0.0'
76+
implementation 'com.google.firebase:protolite-well-known-types:18.0.1'
7777
implementation "io.grpc:grpc-stub:$grpcVersion"
7878
7979
// optionally override grpc's protobuf-lite runtime
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# IMPORTANT (b/285892320) Keep version and latestReleasedVersion in sync
22
# unless you are releasing a new version of the library to prevent issues
33
# with transitive dependencies.
4-
version=18.0.0
4+
version=18.0.1
55
latestReleasedVersion=18.0.0

protolite-well-known-types/protolite-well-known-types.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ firebaseLibrary {
2626

2727
protobuf {
2828
protoc {
29-
artifact = "com.google.protobuf:protoc:3.21.11"
29+
artifact = libs.protoc.get().toString()
3030
}
3131
generateProtoTasks {
3232
all().each { task ->
@@ -41,6 +41,7 @@ protobuf {
4141
}
4242
}
4343
}
44+
4445
android {
4546
namespace "firebase.com.protolitewrapper"
4647
compileSdkVersion project.compileSdkVersion
@@ -64,9 +65,9 @@ android {
6465

6566

6667
dependencies {
67-
protobuf("com.google.api.grpc:proto-google-common-protos:1.18.0"){
68+
protobuf(libs.proto.google.common.protos){
6869
exclude group: "com.google.protobuf", module: "protobuf-java"
6970
}
7071

71-
implementation "com.google.protobuf:protobuf-javalite:3.21.11"
72+
implementation libs.protobuf.java.lite
7273
}

0 commit comments

Comments
 (0)