Skip to content

Commit 787ac8e

Browse files
authored
dataconnect: upgrade data connect emulator to 2.11.0 and firebase-tools to 14.12.0 (#7240)
1 parent 40679f3 commit 787ac8e

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

.github/workflows/dataconnect.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
3535
FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
3636
FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
37-
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
37+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.12.0' }}
3838
FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
3939
FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
4040
FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}

.github/workflows/dataconnect_demo_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
env:
2020
FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
21-
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
21+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.12.0' }}
2222
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
2323
FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
2424
FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase

firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import io.kotest.property.checkAll
4444
import io.kotest.property.exhaustive.enum
4545
import java.util.UUID
4646
import kotlinx.coroutines.test.runTest
47-
import org.junit.Ignore
4847
import org.junit.Test
4948

5049
class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
@@ -484,7 +483,7 @@ class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
484483
checkAll(Exhaustive.enum<N5ekmae3jn>()) { enumValue ->
485484
val tagValue = Arb.dataConnect.tag().next(randomSource())
486485
val key = connector.enumKeyInsert.execute(enumValue) { tag = tagValue }.data.key
487-
key.asClue { it.enumValue shouldBe enumValue }
486+
key.asClue { it.enumValue shouldBe Known(enumValue) }
488487
val queryResult = connector.enumKeyGetByKey.execute(key)
489488
queryResult.asClue {
490489
val item = it.data.item.shouldNotBeNull()
@@ -498,11 +497,6 @@ class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
498497
//////////////////////////////////////////////////////////////////////////////////////////////////
499498

500499
@Test
501-
@Ignore(
502-
"TODO(cl/785956954) Re-enable this test once testing against a data connect " +
503-
"emulator that fixes serialization when more than one user-defined enum type " +
504-
"in the data"
505-
)
506500
fun multipleEnumColumns() = runTest {
507501
checkAll(NUM_ITERATIONS, Arb.enum<N5ekmae3jn>(), Arb.enum<S7yayynb25>()) { enum1, enum2 ->
508502
val key = connector.multipleEnumColumnsInsert.execute(enum1, enum2).data.key

firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"defaultVersion": "2.10.1",
2+
"defaultVersion": "2.11.0",
33
"versions": [
44
{
55
"version": "1.3.4",
@@ -918,6 +918,24 @@
918918
"os": "linux",
919919
"size": 29266104,
920920
"sha512DigestHex": "669ec517e81c52157c6fec60f0aca2856b564c6181764bb3d80107481770289a1fac1c88cdc2fa1a1d246b2e5a5cd19a100444bcef53b7727886283cabea2ecb"
921+
},
922+
{
923+
"version": "2.11.0",
924+
"os": "windows",
925+
"size": 29719040,
926+
"sha512DigestHex": "45627a2c13de13da17c340f0940609e7745bd86dda080316f47ce13378445070390daa2548a1658493fd2567d9fa4ad2d0162f8fec6127b7d4d414a8d575bcd5"
927+
},
928+
{
929+
"version": "2.11.0",
930+
"os": "macos",
931+
"size": 29234016,
932+
"sha512DigestHex": "b224ada8dd36839435e613bc085b819635659728d07f50a22b0c40abcb3112e1f418a66041c59aee10920e5a846a783e27ed344779f98cd5005faff475e2a035"
933+
},
934+
{
935+
"version": "2.11.0",
936+
"os": "linux",
937+
"size": 29159608,
938+
"sha512DigestHex": "af3bad81cc0c0d822a75381db06d4b191c64dd73abdcbd368830e736574b7212d22a3a87c74ce52adee3ca9630876da7b600f8c31f1498d4a76359e51f872a39"
921939
}
922940
]
923941
}

0 commit comments

Comments
 (0)