Skip to content

feat: update with latest from main #2277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blakeli0 merged 4 commits into from
Dec 15, 2025
Merged

feat: update with latest from main #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1665fdf
chore: sync with last release from main branch
diegomarquezp Dec 15, 2025
e42a2af
tests: Ignore flaky tests (#2273)
blakeli0 Dec 12, 2025
8ae27e3
chore(main): release 3.34.1-SNAPSHOT (#2275)
release-please[bot] Dec 13, 2025
546c0d6
chore: generate libraries at Mon Dec 15 20:17:52 UTC 2025
cloud-java-bot Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "3.33.4"
".": "3.34.0"
}
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-firestore'
If you are using Gradle without BOM, add this to your dependencies:

```Groovy
implementation 'com.google.cloud:google-cloud-firestore:3.33.4'
implementation 'com.google.cloud:google-cloud-firestore:3.34.0'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.33.4"
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.34.0"
```

## Authentication
Expand Down Expand Up @@ -219,7 +219,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.33.4
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.34.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-firestore-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<packaging>jar</packaging>
<name>Google Cloud Firestore Admin Client</name>
<url>https://github.com/googleapis/java-firestore</url>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions google-cloud-firestore-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-bom</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-bom:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -52,37 +52,37 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-firestore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-firestore</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<packaging>jar</packaging>
<name>Google Cloud Firestore</name>
<url>https://github.com/googleapis/java-firestore</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-firestore</site.installationModule>
Expand Down
2 changes: 2 additions & 0 deletions google-cloud-firestore/src/test/java/com/google/cloud/firestore/BulkWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
Expand Down Expand Up @@ -1279,6 +1280,7 @@ public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
}

@Test
@Ignore
public void sendsBackoffBatchAfterOtherEnqueuedBatches() throws Exception {
ResponseStubber responseStubber =
new ResponseStubber() {
Expand Down
2 changes: 2 additions & 0 deletions google-cloud-firestore/src/test/java/com/google/cloud/firestore/RecursiveDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
Expand Down Expand Up @@ -326,6 +327,7 @@ public void createsRetryQueryAfterStreamExceptionWithLastReceivedDoc() throws Ex
}

@Test
@Ignore
public void createsSecondQueryWithCorrectStartAfter() throws Exception {
// This test checks that the second query is created with the correct startAfter() once the
// RecursiveDelete instance is below the MIN_PENDING_OPS threshold to send the next batch.
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void before() {
public void after() {
Object[] emptyArray = new Object[0];
assertArrayEquals(exceptions.toArray(), emptyArray);
assertArrayEquals(requests.toArray(), emptyArray);
// assertArrayEquals(requests.toArray(), emptyArray);
assertArrayEquals(documentSnapshots.toArray(), emptyArray);
assertArrayEquals(querySnapshots.toArray(), emptyArray);
listenerRegistration.remove();
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-firestore-admin-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<name>grpc-google-cloud-firestore-admin-v1</name>
<description>GRPC library for grpc-google-cloud-firestore-admin-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-firestore-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<name>grpc-google-cloud-firestore-v1</name>
<description>GRPC library for grpc-google-cloud-firestore-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<packaging>pom</packaging>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<name>Google Cloud Firestore Parent</name>
<url>https://github.com/googleapis/java-firestore</url>
<description>
Expand Down Expand Up @@ -150,32 +150,32 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-firestore-admin-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<name>proto-google-cloud-firestore-admin-v1</name>
<description>PROTO library for proto-google-cloud-firestore-admin-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-firestore-bundle-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->

<name>proto-google-cloud-firestore-bundle-v1</name>
<description>PROTO library for proto-google-cloud-firestore-bundle-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-firestore-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<name>proto-google-cloud-firestore-v1</name>
<description>PROTO library for proto-google-cloud-firestore-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.33.5-rc1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<version>3.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Format:
# module:released-version:current-version

google-cloud-firestore:3.33.4:3.33.5-rc1-SNAPSHOT
google-cloud-firestore-admin:3.33.4:3.33.5-rc1-SNAPSHOT
google-cloud-firestore-bom:3.33.4:3.33.5-rc1-SNAPSHOT
grpc-google-cloud-firestore-admin-v1:3.33.4:3.33.5-rc1-SNAPSHOT
grpc-google-cloud-firestore-v1:3.33.4:3.33.5-rc1-SNAPSHOT
proto-google-cloud-firestore-admin-v1:3.33.4:3.33.5-rc1-SNAPSHOT
proto-google-cloud-firestore-v1:3.33.4:3.33.5-rc1-SNAPSHOT
proto-google-cloud-firestore-bundle-v1:3.33.4:3.33.5-rc1-SNAPSHOT
google-cloud-firestore:3.34.0:3.34.1-SNAPSHOT
google-cloud-firestore-admin:3.34.0:3.34.1-SNAPSHOT
google-cloud-firestore-bom:3.34.0:3.34.1-SNAPSHOT
grpc-google-cloud-firestore-admin-v1:3.34.0:3.34.1-SNAPSHOT
grpc-google-cloud-firestore-v1:3.34.0:3.34.1-SNAPSHOT
proto-google-cloud-firestore-admin-v1:3.34.0:3.34.1-SNAPSHOT
proto-google-cloud-firestore-v1:3.34.0:3.34.1-SNAPSHOT
proto-google-cloud-firestore-bundle-v1:3.34.0:3.34.1-SNAPSHOT
Loading