Skip to content

Commit ae14842

Browse files
authored
dataconnect: upgrade data connect emulator to 14.11.1 (#7177)
1 parent 89ccf1c commit ae14842

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
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.0' }}
37+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
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.0' }}
21+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.1' }}
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/test/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumValueUnknownUnitTest.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.google.firebase.dataconnect.testutil.property.arbitrary.dataConnect
2222
import com.google.firebase.dataconnect.testutil.property.arbitrary.distinctPair
2323
import io.kotest.assertions.withClue
2424
import io.kotest.common.ExperimentalKotest
25+
import io.kotest.matchers.nulls.shouldBeNull
2526
import io.kotest.matchers.shouldBe
2627
import io.kotest.matchers.shouldNotBe
2728
import io.kotest.matchers.types.shouldBeSameInstanceAs
@@ -32,7 +33,6 @@ import io.kotest.property.arbitrary.of
3233
import io.kotest.property.assume
3334
import io.kotest.property.checkAll
3435
import kotlinx.coroutines.test.runTest
35-
import org.junit.Ignore
3636
import org.junit.Test
3737

3838
@Suppress("ReplaceCallWithBinaryOperator")
@@ -47,16 +47,10 @@ class EnumValueUnknownUnitTest {
4747
}
4848

4949
@Test
50-
@Ignore(
51-
"TODO(cl/785477120) Enable this test once a data connect emulator build that " +
52-
"includes cl/785477120 is released, which will have a version >2.10.0 and " +
53-
"a firebase-tools version >14.11.0"
54-
)
5550
fun `value property should unconditionally be null`() = runTest {
5651
checkAll(propTestConfig, Arb.dataConnect.string()) { stringValue ->
5752
val enumValue = EnumValue.Unknown(stringValue)
58-
// TODO(cl/785477120) Uncomment the line below when the test is re-enabled.
59-
// enumValue.value.shouldBeNull()
53+
enumValue.value.shouldBeNull()
6054
}
6155
}
6256

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.0",
2+
"defaultVersion": "2.10.1",
33
"versions": [
44
{
55
"version": "1.3.4",
@@ -900,6 +900,24 @@
900900
"os": "linux",
901901
"size": 29257912,
902902
"sha512DigestHex": "93e71bdc76510cf70410338f016819b97abe7a4b372ee52c0f59c0c58f23814c3f94cf2e6772dce5a8fbabda582f363cabb808b4284dfa142b6bc94d305088a4"
903+
},
904+
{
905+
"version": "2.10.1",
906+
"os": "windows",
907+
"size": 29829632,
908+
"sha512DigestHex": "0f2d7999b6e435ca3c8ed98ba421ccfe954acce7074759faf79c5a5c50cddec360be87a3c1cd2a459c33fd916e230bd673616281e47162748ac6ad70634257fc"
909+
},
910+
{
911+
"version": "2.10.1",
912+
"os": "macos",
913+
"size": 29336416,
914+
"sha512DigestHex": "f3eedb2afbb336934d59b2ce6593e8822e2dfc6d640ab65400ae9d38ff61a0ece1f7c44954058cbff2c9ef667536ea884a3f5487df5eb92c7423816e033a718d"
915+
},
916+
{
917+
"version": "2.10.1",
918+
"os": "linux",
919+
"size": 29266104,
920+
"sha512DigestHex": "669ec517e81c52157c6fec60f0aca2856b564c6181764bb3d80107481770289a1fac1c88cdc2fa1a1d246b2e5a5cd19a100444bcef53b7727886283cabea2ecb"
903921
}
904922
]
905923
}

0 commit comments

Comments
 (0)