WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 8e6f17f

Browse files
dconeybedconeybe
authored
dataconnect: ci: upgrade data connect emulator to 15.0.0 (was 14.27.0) and firebase-tools to 15.0.0 (was 14.27.0) (#7608)
1 parent bc2bc5c commit 8e6f17f

File tree

7 files changed

+146
-124
lines changed

7 files changed

+146
-124
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.27.0' }}
37+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.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.27.0' }}
21+
FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '15.0.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/KeyVariablesIntegrationTest.kt‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() {
117117

118118
val key = connector.insertPrimaryKeyIsInt64.execute(foo = id, value = value).data.key
119119

120-
val queryResult = connector.getPrimaryKeyIsInt64byKey.execute(key)
120+
val queryResult = connector.getPrimaryKeyIsInt64ByKey.execute(key)
121121
queryResult.data.primaryKeyIsInt64 shouldBe
122-
GetPrimaryKeyIsInt64byKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value)
122+
GetPrimaryKeyIsInt64ByKeyQuery.Data.PrimaryKeyIsInt64(foo = id, value = value)
123123
}
124124

125125
@Test
@@ -160,44 +160,38 @@ class KeyVariablesIntegrationTest : DemoConnectorIntegrationTestBase() {
160160
val nested6 = createPrimaryKeyNested6(nested3.key, nested4.key)
161161
val nested7 = createPrimaryKeyNested7(nested5a.key, nested5b.key, nested6.key)
162162

163-
val queryResult = connector.getPrimaryKeyNested7byKey.execute(nested7.key)
163+
val queryResult = connector.getPrimaryKeyNested7ByKey.execute(nested7.key)
164164

165165
queryResult.data shouldBe
166-
GetPrimaryKeyNested7byKeyQuery.Data(
167-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7(
166+
GetPrimaryKeyNested7ByKeyQuery.Data(
167+
GetPrimaryKeyNested7ByKeyQuery.Data.Key(
168168
nested7.value,
169-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a(
169+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a(
170170
nested5a.value,
171-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested1(
171+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested1(
172172
nested1s[0].key.id,
173173
nested1s[0].value
174174
),
175-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5a.Nested2(
175+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5a.Nested2(
176176
nested2s[0].key.id,
177177
nested2s[0].value
178178
),
179179
),
180-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b(
180+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b(
181181
nested5b.value,
182-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested1(
182+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested1(
183183
nested1s[1].key.id,
184184
nested1s[1].value
185185
),
186-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested5b.Nested2(
186+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested5b.Nested2(
187187
nested2s[1].key.id,
188188
nested2s[1].value
189189
),
190190
),
191-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6(
191+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6(
192192
nested6.value,
193-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested3(
194-
nested3.key.id,
195-
nested3.value
196-
),
197-
GetPrimaryKeyNested7byKeyQuery.Data.PrimaryKeyNested7.Nested6.Nested4(
198-
nested4.key.id,
199-
nested4.value
200-
),
193+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested3(nested3.key.id, nested3.value),
194+
GetPrimaryKeyNested7ByKeyQuery.Data.Key.Nested6.Nested4(nested4.key.id, nested4.value),
201195
),
202196
)
203197
)

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,80 +35,80 @@ class NestedStructsIntegrationTest : DemoConnectorIntegrationTestBase() {
3535
val nested1a = createNested1(nested1 = null, nested2Keys)
3636
val nested1b = createNested1(nested1 = nested1a.key, nested2Keys)
3737

38-
val queryResult = connector.getNested1byKey.execute(nested1b.key)
38+
val queryResult = connector.getNested1ByKey.execute(nested1b.key)
3939

4040
queryResult.data shouldBe
41-
GetNested1byKeyQuery.Data(
42-
GetNested1byKeyQuery.Data.Nested1(
41+
GetNested1ByKeyQuery.Data(
42+
GetNested1ByKeyQuery.Data.Nested1(
4343
id = nested1b.key.id,
4444
nested1 =
45-
GetNested1byKeyQuery.Data.Nested1.Nested1(
45+
GetNested1ByKeyQuery.Data.Nested1.Nested1(
4646
id = nested1a.key.id,
4747
nested1 = null,
4848
nested2 =
49-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2(
49+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2(
5050
id = nested2s[0].key.id,
5151
value = nested2s[0].value,
5252
nested3 =
53-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3(
53+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3(
5454
id = nested3s[0].key.id,
5555
value = nested3s[0].value,
5656
),
5757
nested3NullableNull = null,
5858
nested3NullableNonNull =
59-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2.Nested3nullableNonNull(
59+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2.Nested3NullableNonNull(
6060
id = nested3s[1].key.id,
6161
value = nested3s[1].value,
6262
),
6363
),
6464
nested2NullableNull = null,
6565
nested2NullableNonNull =
66-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull(
66+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull(
6767
id = nested2s[1].key.id,
6868
value = nested2s[1].value,
6969
nested3 =
70-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull.Nested3(
70+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull.Nested3(
7171
id = nested3s[2].key.id,
7272
value = nested3s[2].value,
7373
),
7474
nested3NullableNull = null,
7575
nested3NullableNonNull =
76-
GetNested1byKeyQuery.Data.Nested1.Nested1.Nested2nullableNonNull
77-
.Nested3nullableNonNull(
76+
GetNested1ByKeyQuery.Data.Nested1.Nested1.Nested2NullableNonNull
77+
.Nested3NullableNonNull(
7878
id = nested3s[3].key.id,
7979
value = nested3s[3].value,
8080
),
8181
),
8282
),
8383
nested2 =
84-
GetNested1byKeyQuery.Data.Nested1.Nested2(
84+
GetNested1ByKeyQuery.Data.Nested1.Nested2(
8585
id = nested2s[2].key.id,
8686
value = nested2s[2].value,
8787
nested3 =
88-
GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3(
88+
GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3(
8989
id = nested3s[4].key.id,
9090
value = nested3s[4].value,
9191
),
9292
nested3NullableNull = null,
9393
nested3NullableNonNull =
94-
GetNested1byKeyQuery.Data.Nested1.Nested2.Nested3nullableNonNull(
94+
GetNested1ByKeyQuery.Data.Nested1.Nested2.Nested3NullableNonNull(
9595
id = nested3s[5].key.id,
9696
value = nested3s[5].value,
9797
),
9898
),
9999
nested2NullableNull = null,
100100
nested2NullableNonNull =
101-
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull(
101+
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull(
102102
id = nested2s[3].key.id,
103103
value = nested2s[3].value,
104104
nested3 =
105-
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3(
105+
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3(
106106
id = nested3s[6].key.id,
107107
value = nested3s[6].value,
108108
),
109109
nested3NullableNull = null,
110110
nested3NullableNonNull =
111-
GetNested1byKeyQuery.Data.Nested1.Nested2nullableNonNull.Nested3nullableNonNull(
111+
GetNested1ByKeyQuery.Data.Nested1.Nested2NullableNonNull.Nested3NullableNonNull(
112112
id = nested3s[7].key.id,
113113
value = nested3s[7].value,
114114
),

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
754754
runTest(timeout = 60.seconds) {
755755
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
756756
val insertResult =
757-
connector.insertInt64variants.execute(
757+
connector.insertInt64Variants.execute(
758758
nonNullWithZeroValue = 0,
759759
nonNullWithPositiveValue = longs.positiveValue1,
760760
nonNullWithNegativeValue = longs.negativeValue1,
@@ -769,9 +769,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
769769
nullableWithMinValue = Long.MIN_VALUE
770770
}
771771

772-
val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
772+
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
773773
queryResult.data.int64Variants shouldBe
774-
GetInt64variantsByKeyQuery.Data.Int64variants(
774+
GetInt64VariantsByKeyQuery.Data.Int64Variants(
775775
nonNullWithZeroValue = 0,
776776
nonNullWithPositiveValue = longs.positiveValue1,
777777
nonNullWithNegativeValue = longs.negativeValue1,
@@ -790,11 +790,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
790790
@Test
791791
fun insertInt64VariantsWithDefaultValues() =
792792
runTest(timeout = 60.seconds) {
793-
val insertResult = connector.insertInt64variantsWithHardcodedDefaults.execute {}
793+
val insertResult = connector.insertInt64VariantsWithHardcodedDefaults.execute {}
794794

795-
val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
795+
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
796796
queryResult.data.int64Variants shouldBe
797-
GetInt64variantsByKeyQuery.Data.Int64variants(
797+
GetInt64VariantsByKeyQuery.Data.Int64Variants(
798798
nonNullWithZeroValue = 0,
799799
nonNullWithPositiveValue = HardcodedValues.NON_NULL_POSITIVE_LONG,
800800
nonNullWithNegativeValue = HardcodedValues.NON_NULL_NEGATIVE_LONG,
@@ -814,7 +814,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
814814
runTest(timeout = 60.seconds) {
815815
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
816816
val insertResult =
817-
connector.insertInt64variants.execute(
817+
connector.insertInt64Variants.execute(
818818
nonNullWithZeroValue = 0,
819819
nonNullWithPositiveValue = longs.positiveValue1,
820820
nonNullWithNegativeValue = longs.negativeValue1,
@@ -829,7 +829,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
829829
nullableWithMinValue = Long.MIN_VALUE
830830
}
831831

832-
connector.updateInt64variantsByKey.execute(insertResult.data.key) {
832+
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {
833833
nonNullWithZeroValue = Long.MAX_VALUE
834834
nonNullWithPositiveValue = Long.MIN_VALUE
835835
nonNullWithNegativeValue = 0
@@ -843,9 +843,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
843843
nullableWithMinValue = longs.positiveValue5
844844
}
845845

846-
val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
846+
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
847847
queryResult.data.int64Variants shouldBe
848-
GetInt64variantsByKeyQuery.Data.Int64variants(
848+
GetInt64VariantsByKeyQuery.Data.Int64Variants(
849849
nonNullWithZeroValue = Long.MAX_VALUE,
850850
nonNullWithPositiveValue = Long.MIN_VALUE,
851851
nonNullWithNegativeValue = 0,
@@ -866,7 +866,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
866866
runTest(timeout = 60.seconds) {
867867
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
868868
val insertResult =
869-
connector.insertInt64variants.execute(
869+
connector.insertInt64Variants.execute(
870870
nonNullWithZeroValue = 0,
871871
nonNullWithPositiveValue = longs.positiveValue1,
872872
nonNullWithNegativeValue = longs.negativeValue1,
@@ -881,7 +881,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
881881
nullableWithMinValue = Long.MIN_VALUE
882882
}
883883

884-
connector.updateInt64variantsByKey.execute(insertResult.data.key) {
884+
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {
885885
nullableWithNullValue = null
886886
nullableWithZeroValue = null
887887
nullableWithPositiveValue = null
@@ -890,9 +890,9 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
890890
nullableWithMinValue = null
891891
}
892892

893-
val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
893+
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
894894
queryResult.data.int64Variants shouldBe
895-
GetInt64variantsByKeyQuery.Data.Int64variants(
895+
GetInt64VariantsByKeyQuery.Data.Int64Variants(
896896
nonNullWithZeroValue = 0,
897897
nonNullWithPositiveValue = longs.positiveValue1,
898898
nonNullWithNegativeValue = longs.negativeValue1,
@@ -913,7 +913,7 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
913913
runTest(timeout = 60.seconds) {
914914
checkAll(propTestConfig, Arb.thisTest.longs()) { longs ->
915915
val insertResult =
916-
connector.insertInt64variants.execute(
916+
connector.insertInt64Variants.execute(
917917
nonNullWithZeroValue = 0,
918918
nonNullWithPositiveValue = longs.positiveValue1,
919919
nonNullWithNegativeValue = longs.negativeValue1,
@@ -928,11 +928,11 @@ class ScalarVariablesAndDataIntegrationTest : DemoConnectorIntegrationTestBase()
928928
nullableWithMinValue = Long.MIN_VALUE
929929
}
930930

931-
connector.updateInt64variantsByKey.execute(insertResult.data.key) {}
931+
connector.updateInt64VariantsByKey.execute(insertResult.data.key) {}
932932

933-
val queryResult = connector.getInt64variantsByKey.execute(insertResult.data.key)
933+
val queryResult = connector.getInt64VariantsByKey.execute(insertResult.data.key)
934934
queryResult.data.int64Variants shouldBe
935-
GetInt64variantsByKeyQuery.Data.Int64variants(
935+
GetInt64VariantsByKeyQuery.Data.Int64Variants(
936936
nonNullWithZeroValue = 0,
937937
nonNullWithPositiveValue = longs.positiveValue1,
938938
nonNullWithNegativeValue = longs.negativeValue1,

0 commit comments

Comments
 (0)