diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md index 66fce5b35ce..f14e653e79f 100644 --- a/firebase-firestore/CHANGELOG.md +++ b/firebase-firestore/CHANGELOG.md @@ -1,4 +1,5 @@ # Unreleased +* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716] # 25.1.2 diff --git a/firebase-inappmessaging-display/CHANGELOG.md b/firebase-inappmessaging-display/CHANGELOG.md index 15bd2abe75a..a9b37cf7f10 100644 --- a/firebase-inappmessaging-display/CHANGELOG.md +++ b/firebase-inappmessaging-display/CHANGELOG.md @@ -1,4 +1,5 @@ # Unreleased +* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716] # 21.0.1 diff --git a/firebase-inappmessaging/CHANGELOG.md b/firebase-inappmessaging/CHANGELOG.md index 90b3e93ccae..1252d73f787 100644 --- a/firebase-inappmessaging/CHANGELOG.md +++ b/firebase-inappmessaging/CHANGELOG.md @@ -1,4 +1,5 @@ # Unreleased +* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716] # 21.0.1 diff --git a/firebase-perf/CHANGELOG.md b/firebase-perf/CHANGELOG.md index 2112244a524..58bdd0f1d29 100644 --- a/firebase-perf/CHANGELOG.md +++ b/firebase-perf/CHANGELOG.md @@ -1,4 +1,5 @@ # Unreleased +* [changed] Updated `protolite-well-known-types` dependency to `18.0.1`. [#6716] # 21.0.4 diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index b6028e75b61..c0fd6df6056 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -111,7 +111,7 @@ dependencies { implementation libs.dagger.dagger 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 libs.okhttp api("com.google.firebase:firebase-common:21.0.0") api("com.google.firebase:firebase-common-ktx:21.0.0") diff --git a/protolite-well-known-types/CHANGELOG.md b/protolite-well-known-types/CHANGELOG.md index f514bbb890e..9947693ea08 100644 --- a/protolite-well-known-types/CHANGELOG.md +++ b/protolite-well-known-types/CHANGELOG.md @@ -1,3 +1,3 @@ # Unreleased - +* [changed] Updated protobuf dependency to `3.25.5` to fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8). diff --git a/protolite-well-known-types/README.md b/protolite-well-known-types/README.md index 30926d080d8..c2691086078 100644 --- a/protolite-well-known-types/README.md +++ b/protolite-well-known-types/README.md @@ -73,7 +73,7 @@ android { } dependencies { - implementation 'com.google.firebase:protolite-well-known-types:18.0.0' + implementation 'com.google.firebase:protolite-well-known-types:18.0.1' implementation "io.grpc:grpc-stub:$grpcVersion" // optionally override grpc's protobuf-lite runtime diff --git a/protolite-well-known-types/gradle.properties b/protolite-well-known-types/gradle.properties index a60ca35eca9..d7239d0c4fe 100644 --- 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 index f5e5bdd8ff2..fe73979660b 100644 --- a/protolite-well-known-types/protolite-well-known-types.gradle +++ b/protolite-well-known-types/protolite-well-known-types.gradle @@ -26,7 +26,7 @@ firebaseLibrary { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.21.11" + artifact = libs.protoc.get().toString() } generateProtoTasks { all().each { task -> @@ -41,6 +41,7 @@ protobuf { } } } + android { namespace "firebase.com.protolitewrapper" compileSdkVersion project.compileSdkVersion @@ -64,9 +65,9 @@ android { dependencies { - protobuf("com.google.api.grpc:proto-google-common-protos:1.18.0"){ + protobuf(libs.proto.google.common.protos){ exclude group: "com.google.protobuf", module: "protobuf-java" } - implementation "com.google.protobuf:protobuf-javalite:3.21.11" + implementation libs.protobuf.java.lite }