diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9d2565f905..95e8574b17 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "9a8499e4ecfa625646c04d412d5e7d76c0ce3220" + "sha": "029f01d808afbeb531ee70b78f72bccaadfeb1e0" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6" + "sha": "0a071b3460344886297a304253bf924aa68ddb7e" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index aff27dd32a..022d5c9e50 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi @@ -79,6 +79,11 @@ samples) if [[ -f ${SAMPLES_DIR}/pom.xml ]] then + for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do + [[ -f "$FILE" ]] || continue + source "$FILE" + done + pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c8436c..59d2aafc79 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index d7afe00c2c..065f10e9a0 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then exit 1 fi -if [[ -z "${STAGING_BUCKET_V2}" ]]; then - echo "Need to set STAGING_BUCKET_V2 environment variable" - exit 1 -fi - # work from the git root directory pushd $(dirname "$0")/../../ diff --git a/CHANGELOG.md b/CHANGELOG.md index 740478566e..9ade21269a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [2.2.6](https://www.github.com/googleapis/java-firestore/compare/v2.2.5...v2.2.6) (2021-04-13) + + +### Bug Fixes + +* Removed Jackson dependency ([#508](https://www.github.com/googleapis/java-firestore/issues/508)) ([7ada73d](https://www.github.com/googleapis/java-firestore/commit/7ada73d3c0a282be8ce2682c2e9c737690d9f891)) +* typo ([#587](https://www.github.com/googleapis/java-firestore/issues/587)) ([520ac44](https://www.github.com/googleapis/java-firestore/commit/520ac441bcb7944be378ec6099b9ec4de37844d4)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#584](https://www.github.com/googleapis/java-firestore/issues/584)) ([c83a222](https://www.github.com/googleapis/java-firestore/commit/c83a222bd602a489552276c5202796db7fadeffa)) + ### [2.2.5](https://www.github.com/googleapis/java-firestore/compare/v2.2.4...v2.2.5) (2021-03-11) diff --git a/README.md b/README.md index 570d377919..1713941471 100644 --- a/README.md +++ b/README.md @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:19.0.0') +implementation platform('com.google.cloud:libraries-bom:20.0.0') compile 'com.google.cloud:google-cloud-firestore' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-firestore:2.2.4' +compile 'com.google.cloud:google-cloud-firestore:2.2.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "2.2.4" +libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "2.2.5" ``` ## Authentication diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml index d7f3cd0592..e2710ee1a9 100644 --- a/google-cloud-firestore-admin/pom.xml +++ b/google-cloud-firestore-admin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore-admin - 2.2.5 + 2.2.6 jar Google Cloud Firestore Admin Client https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index 767a9ce64c..01531d8871 100644 --- a/google-cloud-firestore-bom/pom.xml +++ b/google-cloud-firestore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-firestore-bom - 2.2.5 + 2.2.6 pom com.google.cloud @@ -63,37 +63,37 @@ com.google.cloud google-cloud-firestore - 2.2.5 + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.5 + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 com.google.cloud google-cloud-firestore-admin - 2.2.5 + 2.2.6 diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 8778cdf403..cf495ffded 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore - 2.2.5 + 2.2.6 jar Google Cloud Firestore https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 google-cloud-firestore @@ -109,10 +109,6 @@ com.google.code.gson gson - - com.fasterxml.jackson.core - jackson-core - com.google.protobuf protobuf-java-util @@ -149,11 +145,6 @@ 0.0.13 test - - com.fasterxml.jackson.core - jackson-databind - test - org.apache.commons commons-lang3 diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java index 5ebd327120..2ac9c033bd 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java @@ -19,8 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.doAnswer; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.gax.retrying.RetrySettings; @@ -55,13 +53,15 @@ import com.google.firestore.v1.StructuredQuery.UnaryFilter; import com.google.firestore.v1.Value; import com.google.firestore.v1.Write; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Message; import com.google.protobuf.NullValue; import com.google.type.LatLng; -import java.io.IOException; +import java.lang.reflect.Type; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -970,12 +970,9 @@ public static Map mapAnyType(Object... entries) { } private static Map fromJsonString(String json) { - try { - ObjectMapper mapper = new ObjectMapper(); - return mapper.readValue(json, new TypeReference>() {}); - } catch (IOException e) { - throw new RuntimeException(e); - } + Type type = new TypeToken>() {}.getType(); + Gson gson = new Gson(); + return gson.fromJson(json, type); } public static Map fromSingleQuotedString(String json) { diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java index a64eb466cf..76be4126de 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java @@ -20,9 +20,11 @@ import static com.google.cloud.firestore.LocalFirestoreHelper.mapAnyType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.cloud.Timestamp; import com.google.cloud.firestore.annotation.DocumentId; import com.google.cloud.firestore.annotation.Exclude; import com.google.cloud.firestore.annotation.PropertyName; @@ -43,6 +45,7 @@ import java.util.Objects; import java.util.Set; import org.junit.Test; +import org.junit.function.ThrowingRunnable; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.Spy; @@ -698,11 +701,11 @@ public String getValue() { } private static class PackageConstructorBean { - private String value; + private Timestamp value; PackageConstructorBean() {} - public String getValue() { + public Timestamp getValue() { return value; } } @@ -950,11 +953,20 @@ private static T deserialize(String jsonString, Class clazz) { return deserialize(jsonString, clazz, /*docRef=*/ null); } + private static T deserialize(Map json, Class clazz) { + return deserialize(json, clazz, /*docRef=*/ null); + } + private static T deserialize(String jsonString, Class clazz, DocumentReference docRef) { Map json = fromSingleQuotedString(jsonString); return CustomClassMapper.convertToCustomClass(json, clazz, docRef); } + private static T deserialize( + Map json, Class clazz, DocumentReference docRef) { + return CustomClassMapper.convertToCustomClass(json, clazz, docRef); + } + private static Object serialize(Object object) { return CustomClassMapper.convertToPlainJavaTypes(object); } @@ -1079,23 +1091,35 @@ public void primitiveDeserializeDouble() { @Test public void primitiveDeserializeBigDecimal() { BigDecimalBean beanBigdecimal = deserialize("{'value': 123}", BigDecimalBean.class); - assertEquals(BigDecimal.valueOf(123), beanBigdecimal.value); + assertEquals(BigDecimal.valueOf(123.0), beanBigdecimal.value); beanBigdecimal = deserialize("{'value': '123'}", BigDecimalBean.class); assertEquals(BigDecimal.valueOf(123), beanBigdecimal.value); // Int - BigDecimalBean beanInt = deserialize("{'value': 1}", BigDecimalBean.class); + BigDecimalBean beanInt = + deserialize(Collections.singletonMap("value", 1), BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1), beanInt.value); // Long - BigDecimalBean beanLong = deserialize("{'value': 1234567890123}", BigDecimalBean.class); + BigDecimalBean beanLong = + deserialize( + Collections.singletonMap("value", 1234567890123L), + BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1234567890123L), beanLong.value); // Double - BigDecimalBean beanDouble = deserialize("{'value': 1.1}", BigDecimalBean.class); + BigDecimalBean beanDouble = + deserialize(Collections.singletonMap("value", 1.1), BigDecimalBean.class); assertEquals(BigDecimal.valueOf(1.1), beanDouble.value); + // BigDecimal + BigDecimalBean beanBigDecimal = + deserialize( + Collections.singletonMap("value", BigDecimal.valueOf(1.2)), + BigDecimalBean.class); + assertEquals(BigDecimal.valueOf(1.2), beanBigDecimal.value); + // Boolean try { deserialize("{'value': true}", BigDecimalBean.class); @@ -1117,10 +1141,13 @@ public void primitiveDeserializeFloat() { assertEquals(1.1, beanFloat.value, EPSILON); // Int - FloatBean beanInt = deserialize("{'value': 1}", FloatBean.class); + FloatBean beanInt = + deserialize(Collections.singletonMap("value", 1), FloatBean.class); assertEquals(1, beanInt.value, EPSILON); // Long - FloatBean beanLong = deserialize("{'value': 1234567890123}", FloatBean.class); + FloatBean beanLong = + deserialize( + Collections.singletonMap("value", 1234567890123L), FloatBean.class); assertEquals((float) 1234567890123L, beanLong.value, EPSILON); // Boolean @@ -1213,15 +1240,18 @@ public void primitiveDeserializeLong() { @Test public void primitiveDeserializeWrongTypeMap() { - assertExceptionContains( - "Failed to convert value of type java.util.LinkedHashMap to String " - + "(found in field 'value')", - new Runnable() { - @Override - public void run() { - deserialize("{'value': {'foo': 'bar'}}", StringBean.class); - } - }); + String expectedExceptionMessage = + ".* Failed to convert value of type .*Map to String \\(found in field 'value'\\).*"; + Throwable exception = + assertThrows( + RuntimeException.class, + new ThrowingRunnable() { + @Override + public void run() throws Throwable { + deserialize("{'value': {'foo': 'bar'}}", StringBean.class); + } + }); + assertTrue(exception.getMessage().matches(expectedExceptionMessage)); } @Test @@ -1565,14 +1595,16 @@ public void serializeDoubleBean() { public void serializeIntBean() { IntBean bean = new IntBean(); bean.value = 1; - assertJson("{'value': 1}", serialize(bean)); + assertJson("{'value': 1}", serialize(Collections.singletonMap("value", 1.0))); } @Test public void serializeLongBean() { LongBean bean = new LongBean(); bean.value = 1234567890123L; - assertJson("{'value': 1234567890123}", serialize(bean)); + assertJson( + "{'value': 1.234567890123E12}", + serialize(Collections.singletonMap("value", 1.234567890123E12))); } @Test @@ -2061,8 +2093,12 @@ public void run() { @Test public void packageConstructorCanBeDeserialized() { - PackageConstructorBean bean = deserialize("{'value': 'foo'}", PackageConstructorBean.class); - assertEquals("foo", bean.value); + Timestamp timestamp = Timestamp.now(); + PackageConstructorBean bean = + deserialize( + Collections.singletonMap("value", timestamp), + PackageConstructorBean.class); + assertEquals(timestamp, bean.value); } @Test @@ -2245,10 +2281,10 @@ public void serializingGenericBeansSupported() { recursiveBean.value.value = "foo"; assertJson("{'value': {'value': 'foo'}}", serialize(recursiveBean)); - DoubleGenericBean doubleBean = new DoubleGenericBean<>(); + DoubleGenericBean doubleBean = new DoubleGenericBean<>(); doubleBean.valueA = "foo"; - doubleBean.valueB = 1; - assertJson("{'valueA': 'foo', 'valueB': 1}", serialize(doubleBean)); + doubleBean.valueB = 1.0; + assertJson("{'valueB': 1, 'valueA': 'foo'}", serialize(doubleBean)); } @Test @@ -2486,7 +2522,7 @@ public void run() { public void settersCanOverridePrimitiveSettersSerializing() { NonConflictingSetterSubBean bean = new NonConflictingSetterSubBean(); bean.value = 1; - assertJson("{'value': 1}", serialize(bean)); + assertJson("{'value': 1}", serialize(Collections.singletonMap("value", 1.0))); } @Test @@ -2741,6 +2777,14 @@ public void documentIdsDeserialize() { assertEquals("doc123", deserialize("{}", DocumentIdOnStringField.class, ref).docId); + assertEquals( + "doc123", + deserialize( + Collections.singletonMap("property", 100), + DocumentIdOnStringField.class, + ref) + .docId); + DocumentIdOnStringFieldAsProperty target = deserialize("{'anotherProperty': 100}", DocumentIdOnStringFieldAsProperty.class, ref); assertEquals("doc123", target.docId); diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java index a5387a38d0..11e53804c2 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java @@ -1535,7 +1535,7 @@ public Void updateCallback(Transaction transaction) throws Exception { final StatusRuntimeException invalidArgument = (StatusRuntimeException) rootCause; final Status status = invalidArgument.getStatus(); assertThat(status.getCode()).isEqualTo(Code.FAILED_PRECONDITION); - assertThat(status.getDescription()).contains("old"); + assertThat(status.getDescription()).contains("minimum"); } } diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml index c33d09f9d8..864499ba4e 100644 --- a/grpc-google-cloud-firestore-admin-v1/pom.xml +++ b/grpc-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 grpc-google-cloud-firestore-admin-v1 GRPC library for grpc-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml index c4aa31488a..7af60f5711 100644 --- a/grpc-google-cloud-firestore-v1/pom.xml +++ b/grpc-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 grpc-google-cloud-firestore-v1 GRPC library for grpc-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/pom.xml b/pom.xml index 54a1745ab0..de3cd5d00e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-firestore-parent pom - 2.2.5 + 2.2.6 Google Cloud Firestore Parent https://github.com/googleapis/java-firestore @@ -159,33 +159,33 @@ com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 2.2.5 + 2.2.6 com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 com.google.api.grpc grpc-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 com.google.cloud google-cloud-shared-dependencies - 0.20.1 + 0.21.0 pom import diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml index f44f29c202..99d6049561 100644 --- a/proto-google-cloud-firestore-admin-v1/pom.xml +++ b/proto-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 2.2.5 + 2.2.6 proto-google-cloud-firestore-admin-v1 PROTO library for proto-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml index 9e0a1c2222..ee8fa40178 100644 --- a/proto-google-cloud-firestore-bundle-v1/pom.xml +++ b/proto-google-cloud-firestore-bundle-v1/pom.xml @@ -5,14 +5,14 @@ 4.0.0 proto-google-cloud-firestore-bundle-v1 - 2.2.5 + 2.2.6 proto-google-cloud-firestore-bundle-v1 PROTO library for proto-google-cloud-firestore-bundle-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml index 85043dcec5..750987d035 100644 --- a/proto-google-cloud-firestore-v1/pom.xml +++ b/proto-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-v1 - 2.2.5 + 2.2.6 proto-google-cloud-firestore-v1 PROTO library for proto-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 2.2.5 + 2.2.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3e35c551c4..c7c02a1b2f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6b26d95b23..86185e6613 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-firestore - 2.2.4 + 2.2.5 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8ef1a60c17..f0921d2839 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -33,7 +33,7 @@ com.google.cloud libraries-bom - 19.0.0 + 20.0.0 pom import diff --git a/synth.metadata b/synth.metadata index 0bf23d44d1..b35bd164f9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "7370d21994126d206f51a8c0c1677b5dc0ee030f" + "sha": "029f01d808afbeb531ee70b78f72bccaadfeb1e0" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" + "sha": "082e1ca0863b13ada8594fe91845380765da5b70" } } ], @@ -63,6 +63,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", diff --git a/versions.txt b/versions.txt index d29e88c947..7232fa607c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,11 +1,11 @@ # Format: # module:released-version:current-version -google-cloud-firestore:2.2.5:2.2.5 -google-cloud-firestore-admin:2.2.5:2.2.5 -google-cloud-firestore-bom:2.2.5:2.2.5 -google-cloud-firestore-parent:2.2.5:2.2.5 -grpc-google-cloud-firestore-admin-v1:2.2.5:2.2.5 -grpc-google-cloud-firestore-v1:2.2.5:2.2.5 -proto-google-cloud-firestore-admin-v1:2.2.5:2.2.5 -proto-google-cloud-firestore-v1:2.2.5:2.2.5 +google-cloud-firestore:2.2.6:2.2.6 +google-cloud-firestore-admin:2.2.6:2.2.6 +google-cloud-firestore-bom:2.2.6:2.2.6 +google-cloud-firestore-parent:2.2.6:2.2.6 +grpc-google-cloud-firestore-admin-v1:2.2.6:2.2.6 +grpc-google-cloud-firestore-v1:2.2.6:2.2.6 +proto-google-cloud-firestore-admin-v1:2.2.6:2.2.6 +proto-google-cloud-firestore-v1:2.2.6:2.2.6