Skip to content

Commit 544ae52

Browse files
committed
Merge remote-tracking branch 'origin/main' at 3803777
2 parents 3be0e69 + 3803777 commit 544ae52

File tree

92 files changed

+1335
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1335
-618
lines changed

.github/workflows/integration_tests.yml

Lines changed: 114 additions & 384 deletions
Large diffs are not rendered by default.

database/integration_test/Podfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11

22
source 'https://github.com/CocoaPods/Specs.git'
3-
platform :ios, '10.0'
43
# Firebase Realtime Database test application.
54

65
target 'integration_test' do
6+
platform :ios, '10.0'
7+
pod 'Firebase/Database', '8.1.1'
8+
pod 'Firebase/Auth', '8.1.1'
9+
end
10+
11+
target 'integration_test_tvos' do
12+
platform :tvos, '10.0'
713
pod 'Firebase/Database', '8.1.1'
814
pod 'Firebase/Auth', '8.1.1'
915
end

database/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
529226D61C85F68000C89379 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D51C85F68000C89379 /* Foundation.framework */; };
1212
529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D71C85F68000C89379 /* CoreGraphics.framework */; };
1313
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D91C85F68000C89379 /* UIKit.framework */; };
14+
9F2ABA30267A4720001A35CE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA2E267A4720001A35CE /* Main.storyboard */; };
15+
9F2ABA32267A4721001A35CE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA31267A4721001A35CE /* Assets.xcassets */; };
16+
9F2ABA35267A4721001A35CE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA33267A4721001A35CE /* LaunchScreen.storyboard */; };
17+
9F2ABA3C267A4744001A35CE /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
18+
9F2ABA3E267A4747001A35CE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
19+
9F2ABA3F267A474A001A35CE /* app_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EF22CB32A000C2651A /* app_framework.cc */; };
20+
9F2ABA40267A474D001A35CE /* firebase_test_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EC22CB323300C2651A /* firebase_test_framework.cc */; };
21+
9F2ABA41267A474F001A35CE /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
22+
9F4C472E267A4DB6001E25DA /* ios_app_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E722CB322900C2651A /* ios_app_framework.mm */; };
23+
9F4C472F267A4DC0001E25DA /* ios_firebase_test_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E822CB322900C2651A /* ios_firebase_test_framework.mm */; };
1424
D61C5F8E22BABA9C00A79141 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D61C5F8C22BABA9B00A79141 /* Images.xcassets */; };
1525
D61C5F9622BABAD200A79141 /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
1626
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
@@ -29,6 +39,11 @@
2939
529226D71C85F68000C89379 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
3040
529226D91C85F68000C89379 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
3141
529226EE1C85F68000C89379 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
42+
9F2ABA26267A4720001A35CE /* integration_test_tvos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_tvos.app; sourceTree = BUILT_PRODUCTS_DIR; };
43+
9F2ABA2F267A4720001A35CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
44+
9F2ABA31267A4721001A35CE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
45+
9F2ABA34267A4721001A35CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
46+
9F2ABA36267A4721001A35CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3247
D61C5F8C22BABA9B00A79141 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
3348
D61C5F8D22BABA9C00A79141 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3449
D61C5F9222BABAD100A79141 /* integration_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = integration_test.cc; path = src/integration_test.cc; sourceTree = "<group>"; };
@@ -56,6 +71,13 @@
5671
);
5772
runOnlyForDeploymentPostprocessing = 0;
5873
};
74+
9F2ABA23267A4720001A35CE /* Frameworks */ = {
75+
isa = PBXFrameworksBuildPhase;
76+
buildActionMask = 2147483647;
77+
files = (
78+
);
79+
runOnlyForDeploymentPostprocessing = 0;
80+
};
5981
/* End PBXFrameworksBuildPhase section */
6082

6183
/* Begin PBXGroup section */
@@ -67,6 +89,7 @@
6789
D66B16861CE46E8900E5638A /* LaunchScreen.storyboard */,
6890
520BC0381C869159008CFBC3 /* GoogleService-Info.plist */,
6991
5292271D1C85FB5500C89379 /* src */,
92+
9F2ABA27267A4720001A35CE /* integration_test_tvos */,
7093
529226D41C85F68000C89379 /* Frameworks */,
7194
529226D31C85F68000C89379 /* Products */,
7295
);
@@ -76,6 +99,7 @@
7699
isa = PBXGroup;
77100
children = (
78101
529226D21C85F68000C89379 /* integration_test.app */,
102+
9F2ABA26267A4720001A35CE /* integration_test_tvos.app */,
79103
);
80104
name = Products;
81105
sourceTree = "<group>";
@@ -117,6 +141,17 @@
117141
name = ios;
118142
sourceTree = "<group>";
119143
};
144+
9F2ABA27267A4720001A35CE /* integration_test_tvos */ = {
145+
isa = PBXGroup;
146+
children = (
147+
9F2ABA2E267A4720001A35CE /* Main.storyboard */,
148+
9F2ABA31267A4721001A35CE /* Assets.xcassets */,
149+
9F2ABA33267A4721001A35CE /* LaunchScreen.storyboard */,
150+
9F2ABA36267A4721001A35CE /* Info.plist */,
151+
);
152+
path = integration_test_tvos;
153+
sourceTree = "<group>";
154+
};
120155
/* End PBXGroup section */
121156

122157
/* Begin PBXNativeTarget section */
@@ -137,6 +172,23 @@
137172
productReference = 529226D21C85F68000C89379 /* integration_test.app */;
138173
productType = "com.apple.product-type.application";
139174
};
175+
9F2ABA25267A4720001A35CE /* integration_test_tvos */ = {
176+
isa = PBXNativeTarget;
177+
buildConfigurationList = 9F2ABA3B267A4721001A35CE /* Build configuration list for PBXNativeTarget "integration_test_tvos" */;
178+
buildPhases = (
179+
9F2ABA22267A4720001A35CE /* Sources */,
180+
9F2ABA23267A4720001A35CE /* Frameworks */,
181+
9F2ABA24267A4720001A35CE /* Resources */,
182+
);
183+
buildRules = (
184+
);
185+
dependencies = (
186+
);
187+
name = integration_test_tvos;
188+
productName = integration_test_tvos;
189+
productReference = 9F2ABA26267A4720001A35CE /* integration_test_tvos.app */;
190+
productType = "com.apple.product-type.application";
191+
};
140192
/* End PBXNativeTarget section */
141193

142194
/* Begin PBXProject section */
@@ -151,21 +203,28 @@
151203
DevelopmentTeam = EQHXZ8M8AV;
152204
ProvisioningStyle = Automatic;
153205
};
206+
9F2ABA25267A4720001A35CE = {
207+
CreatedOnToolsVersion = 12.5;
208+
ProvisioningStyle = Automatic;
209+
};
154210
};
155211
};
156212
buildConfigurationList = 529226CD1C85F68000C89379 /* Build configuration list for PBXProject "integration_test" */;
157213
compatibilityVersion = "Xcode 3.2";
158214
developmentRegion = English;
159215
hasScannedForEncodings = 0;
160216
knownRegions = (
217+
English,
161218
en,
219+
Base,
162220
);
163221
mainGroup = 529226C91C85F68000C89379;
164222
productRefGroup = 529226D31C85F68000C89379 /* Products */;
165223
projectDirPath = "";
166224
projectRoot = "";
167225
targets = (
168226
529226D11C85F68000C89379 /* integration_test */,
227+
9F2ABA25267A4720001A35CE /* integration_test_tvos */,
169228
);
170229
};
171230
/* End PBXProject section */
@@ -181,6 +240,16 @@
181240
);
182241
runOnlyForDeploymentPostprocessing = 0;
183242
};
243+
9F2ABA24267A4720001A35CE /* Resources */ = {
244+
isa = PBXResourcesBuildPhase;
245+
buildActionMask = 2147483647;
246+
files = (
247+
9F2ABA35267A4721001A35CE /* LaunchScreen.storyboard in Resources */,
248+
9F2ABA32267A4721001A35CE /* Assets.xcassets in Resources */,
249+
9F2ABA30267A4720001A35CE /* Main.storyboard in Resources */,
250+
);
251+
runOnlyForDeploymentPostprocessing = 0;
252+
};
184253
/* End PBXResourcesBuildPhase section */
185254

186255
/* Begin PBXSourcesBuildPhase section */
@@ -198,8 +267,41 @@
198267
);
199268
runOnlyForDeploymentPostprocessing = 0;
200269
};
270+
9F2ABA22267A4720001A35CE /* Sources */ = {
271+
isa = PBXSourcesBuildPhase;
272+
buildActionMask = 2147483647;
273+
files = (
274+
9F2ABA41267A474F001A35CE /* integration_test.cc in Sources */,
275+
9F4C472F267A4DC0001E25DA /* ios_firebase_test_framework.mm in Sources */,
276+
9F2ABA3C267A4744001A35CE /* gmock-all.cc in Sources */,
277+
9F4C472E267A4DB6001E25DA /* ios_app_framework.mm in Sources */,
278+
9F2ABA3F267A474A001A35CE /* app_framework.cc in Sources */,
279+
9F2ABA3E267A4747001A35CE /* gtest-all.cc in Sources */,
280+
9F2ABA40267A474D001A35CE /* firebase_test_framework.cc in Sources */,
281+
);
282+
runOnlyForDeploymentPostprocessing = 0;
283+
};
201284
/* End PBXSourcesBuildPhase section */
202285

286+
/* Begin PBXVariantGroup section */
287+
9F2ABA2E267A4720001A35CE /* Main.storyboard */ = {
288+
isa = PBXVariantGroup;
289+
children = (
290+
9F2ABA2F267A4720001A35CE /* Base */,
291+
);
292+
name = Main.storyboard;
293+
sourceTree = "<group>";
294+
};
295+
9F2ABA33267A4721001A35CE /* LaunchScreen.storyboard */ = {
296+
isa = PBXVariantGroup;
297+
children = (
298+
9F2ABA34267A4721001A35CE /* Base */,
299+
);
300+
name = LaunchScreen.storyboard;
301+
sourceTree = "<group>";
302+
};
303+
/* End PBXVariantGroup section */
304+
203305
/* Begin XCBuildConfiguration section */
204306
529226F71C85F68000C89379 /* Debug */ = {
205307
isa = XCBuildConfiguration;
@@ -337,6 +439,106 @@
337439
};
338440
name = Release;
339441
};
442+
9F2ABA39267A4721001A35CE /* Debug */ = {
443+
isa = XCBuildConfiguration;
444+
buildSettings = {
445+
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
446+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
447+
CLANG_ANALYZER_NONNULL = YES;
448+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
449+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
450+
CLANG_ENABLE_OBJC_WEAK = YES;
451+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
452+
CLANG_WARN_COMMA = YES;
453+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
454+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
455+
CLANG_WARN_INFINITE_RECURSION = YES;
456+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
457+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
458+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
459+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
460+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
461+
CLANG_WARN_STRICT_PROTOTYPES = YES;
462+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
463+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
464+
CODE_SIGN_STYLE = Automatic;
465+
DEBUG_INFORMATION_FORMAT = dwarf;
466+
ENABLE_TESTABILITY = YES;
467+
FRAMEWORK_SEARCH_PATHS = (
468+
"$(inherited)",
469+
"$(PROJECT_DIR)",
470+
);
471+
GCC_C_LANGUAGE_STANDARD = gnu11;
472+
HEADER_SEARCH_PATHS = (
473+
"$(inherited)",
474+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
475+
"\"$(SRCROOT)/src\"",
476+
"\"$(SRCROOT)/external/googletest/src/googletest/include\"",
477+
"\"$(SRCROOT)/external/googletest/src/googlemock/include\"",
478+
"\"$(SRCROOT)/external/googletest/src/googletest\"",
479+
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
480+
);
481+
INFOPLIST_FILE = integration_test_tvos/Info.plist;
482+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
483+
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
484+
MTL_FAST_MATH = YES;
485+
PRODUCT_BUNDLE_IDENTIFIER = "com.google.ios.database.testapp.integration-test-tvos";
486+
PRODUCT_NAME = "$(TARGET_NAME)";
487+
SDKROOT = appletvos;
488+
TARGETED_DEVICE_FAMILY = 3;
489+
TVOS_DEPLOYMENT_TARGET = 14.5;
490+
};
491+
name = Debug;
492+
};
493+
9F2ABA3A267A4721001A35CE /* Release */ = {
494+
isa = XCBuildConfiguration;
495+
buildSettings = {
496+
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
497+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
498+
CLANG_ANALYZER_NONNULL = YES;
499+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
500+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
501+
CLANG_ENABLE_OBJC_WEAK = YES;
502+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
503+
CLANG_WARN_COMMA = YES;
504+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
505+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
506+
CLANG_WARN_INFINITE_RECURSION = YES;
507+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
508+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
509+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
510+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
511+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
512+
CLANG_WARN_STRICT_PROTOTYPES = YES;
513+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
514+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
515+
CODE_SIGN_STYLE = Automatic;
516+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
517+
FRAMEWORK_SEARCH_PATHS = (
518+
"$(inherited)",
519+
"$(PROJECT_DIR)",
520+
);
521+
GCC_C_LANGUAGE_STANDARD = gnu11;
522+
HEADER_SEARCH_PATHS = (
523+
"$(inherited)",
524+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
525+
"\"$(SRCROOT)/src\"",
526+
"\"$(SRCROOT)/external/googletest/src/googletest/include\"",
527+
"\"$(SRCROOT)/external/googletest/src/googlemock/include\"",
528+
"\"$(SRCROOT)/external/googletest/src/googletest\"",
529+
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
530+
);
531+
INFOPLIST_FILE = integration_test_tvos/Info.plist;
532+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
533+
MTL_FAST_MATH = YES;
534+
PRODUCT_BUNDLE_IDENTIFIER = "com.google.ios.database.testapp.integration-test-tvos";
535+
PRODUCT_NAME = "$(TARGET_NAME)";
536+
SDKROOT = appletvos;
537+
TARGETED_DEVICE_FAMILY = 3;
538+
TVOS_DEPLOYMENT_TARGET = 14.5;
539+
};
540+
name = Release;
541+
};
340542
/* End XCBuildConfiguration section */
341543

342544
/* Begin XCConfigurationList section */
@@ -358,6 +560,15 @@
358560
defaultConfigurationIsVisible = 0;
359561
defaultConfigurationName = Release;
360562
};
563+
9F2ABA3B267A4721001A35CE /* Build configuration list for PBXNativeTarget "integration_test_tvos" */ = {
564+
isa = XCConfigurationList;
565+
buildConfigurations = (
566+
9F2ABA39267A4721001A35CE /* Debug */,
567+
9F2ABA3A267A4721001A35CE /* Release */,
568+
);
569+
defaultConfigurationIsVisible = 0;
570+
defaultConfigurationName = Release;
571+
};
361572
/* End XCConfigurationList section */
362573
};
363574
rootObject = 529226CA1C85F68000C89379 /* Project object */;

database/integration_test/integration_test.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"colors" : [
3+
{
4+
"idiom" : "universal"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "tv"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
},
6+
"layers" : [
7+
{
8+
"filename" : "Front.imagestacklayer"
9+
},
10+
{
11+
"filename" : "Middle.imagestacklayer"
12+
},
13+
{
14+
"filename" : "Back.imagestacklayer"
15+
}
16+
]
17+
}

0 commit comments

Comments
 (0)