Skip to content

Commit 7d0c987

Browse files
authored
Merge pull request #487 from firebase/feature/tvos-cleanup-integration-tests
Feature/tvos cleanup integration tests
2 parents 140b58b + 24d7d9d commit 7d0c987

File tree

158 files changed

+61
-2279
lines changed

Some content is hidden

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

158 files changed

+61
-2279
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ gcs_key_file.json
2020
*_build/
2121
*cmake-build-debug/
2222
testing/test_framework/external/
23+
24+
# XCode user specific folders
25+
**/xcuserdata/

auth/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
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-
9CC93CB1C0E04196BE7AA874 /* libPods-integration_test_tvos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE5DF88312698BE99BFA8CD9 /* libPods-integration_test_tvos.a */; };
1514
9F3A08F5266978C300E1D69F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F3A08F3266978C300E1D69F /* Main.storyboard */; };
16-
9F3A08F7266978C400E1D69F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F3A08F6266978C400E1D69F /* Assets.xcassets */; };
1715
9F3A08FA266978C400E1D69F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F3A08F8266978C400E1D69F /* LaunchScreen.storyboard */; };
1816
9F3A09012669791B00E1D69F /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
1917
9F3A09022669791E00E1D69F /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
@@ -24,6 +22,7 @@
2422
9F5DD09926697AD30058C144 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520BC0381C869159008CFBC3 /* GoogleService-Info.plist */; };
2523
9F5DD0AB266A7ACE0058C144 /* ios_app_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E722CB322900C2651A /* ios_app_framework.mm */; };
2624
9F5DD0AC266A7AD30058C144 /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
25+
BCF6A95A2682C2AB00578FDD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF6A9592682C2AB00578FDD /* Foundation.framework */; };
2726
D61C5F8E22BABA9C00A79141 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D61C5F8C22BABA9B00A79141 /* Images.xcassets */; };
2827
D61C5F9622BABAD200A79141 /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
2928
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
@@ -33,7 +32,6 @@
3332
D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E822CB322900C2651A /* ios_firebase_test_framework.mm */; };
3433
D6C179EE22CB323300C2651A /* firebase_test_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EC22CB323300C2651A /* firebase_test_framework.cc */; };
3534
D6C179F022CB32A000C2651A /* app_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EF22CB32A000C2651A /* app_framework.cc */; };
36-
F0EC8E33F7E7F4BF705A3991 /* libPods-integration_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46998791754BF3DDE5D7A20F /* libPods-integration_test.a */; };
3735
/* End PBXBuildFile section */
3836

3937
/* Begin PBXBuildRule section */
@@ -51,23 +49,19 @@
5149
/* End PBXBuildRule section */
5250

5351
/* Begin PBXFileReference section */
54-
2584BCCABE98221F4709B89E /* Pods-integration_test.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test.release.xcconfig"; path = "Target Support Files/Pods-integration_test/Pods-integration_test.release.xcconfig"; sourceTree = "<group>"; };
5552
46998791754BF3DDE5D7A20F /* libPods-integration_test.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5653
520BC0381C869159008CFBC3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
5754
529226D21C85F68000C89379 /* integration_test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test.app; sourceTree = BUILT_PRODUCTS_DIR; };
5855
529226D51C85F68000C89379 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5956
529226D71C85F68000C89379 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
6057
529226D91C85F68000C89379 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
6158
529226EE1C85F68000C89379 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
62-
5DEB90B0D272D92969404783 /* Pods-integration_test_tvos.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test_tvos.debug.xcconfig"; path = "Target Support Files/Pods-integration_test_tvos/Pods-integration_test_tvos.debug.xcconfig"; sourceTree = "<group>"; };
63-
9C11DDB75B69AFC403F349C3 /* Pods-integration_test_tvos.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test_tvos.release.xcconfig"; path = "Target Support Files/Pods-integration_test_tvos/Pods-integration_test_tvos.release.xcconfig"; sourceTree = "<group>"; };
6459
9F3A08EB266978C300E1D69F /* integration_test_tvos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_tvos.app; sourceTree = BUILT_PRODUCTS_DIR; };
6560
9F3A08F4266978C300E1D69F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
66-
9F3A08F6266978C400E1D69F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6761
9F3A08F9266978C400E1D69F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
68-
9F3A08FB266978C400E1D69F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6962
9F5DD09126697A170058C144 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS14.5.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
7063
9F5DD09326697A5F0058C144 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS14.5.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
64+
BCF6A9592682C2AB00578FDD /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS14.5.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
7165
D61C5F8C22BABA9B00A79141 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
7266
D61C5F8D22BABA9C00A79141 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7367
D61C5F9222BABAD100A79141 /* integration_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = integration_test.cc; path = src/integration_test.cc; sourceTree = "<group>"; };
@@ -84,7 +78,6 @@
8478
D6C179EF22CB32A000C2651A /* app_framework.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = app_framework.cc; path = src/app_framework.cc; sourceTree = "<group>"; };
8579
D6E7D43C22D51D9900EDBD35 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
8680
DE5DF88312698BE99BFA8CD9 /* libPods-integration_test_tvos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test_tvos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
87-
F56939B9262D9DAC1194ECAB /* Pods-integration_test.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test.debug.xcconfig"; path = "Target Support Files/Pods-integration_test/Pods-integration_test.debug.xcconfig"; sourceTree = "<group>"; };
8881
/* End PBXFileReference section */
8982

9083
/* Begin PBXFrameworksBuildPhase section */
@@ -95,34 +88,22 @@
9588
529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */,
9689
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */,
9790
529226D61C85F68000C89379 /* Foundation.framework in Frameworks */,
98-
F0EC8E33F7E7F4BF705A3991 /* libPods-integration_test.a in Frameworks */,
9991
);
10092
runOnlyForDeploymentPostprocessing = 0;
10193
};
10294
9F3A08E8266978C300E1D69F /* Frameworks */ = {
10395
isa = PBXFrameworksBuildPhase;
10496
buildActionMask = 2147483647;
10597
files = (
98+
BCF6A95A2682C2AB00578FDD /* Foundation.framework in Frameworks */,
10699
9F5DD09426697A5F0058C144 /* CoreGraphics.framework in Frameworks */,
107100
9F5DD09226697A170058C144 /* UIKit.framework in Frameworks */,
108-
9CC93CB1C0E04196BE7AA874 /* libPods-integration_test_tvos.a in Frameworks */,
109101
);
110102
runOnlyForDeploymentPostprocessing = 0;
111103
};
112104
/* End PBXFrameworksBuildPhase section */
113105

114106
/* Begin PBXGroup section */
115-
1A5183E5C501F81ED7C672DA /* Pods */ = {
116-
isa = PBXGroup;
117-
children = (
118-
F56939B9262D9DAC1194ECAB /* Pods-integration_test.debug.xcconfig */,
119-
2584BCCABE98221F4709B89E /* Pods-integration_test.release.xcconfig */,
120-
5DEB90B0D272D92969404783 /* Pods-integration_test_tvos.debug.xcconfig */,
121-
9C11DDB75B69AFC403F349C3 /* Pods-integration_test_tvos.release.xcconfig */,
122-
);
123-
path = Pods;
124-
sourceTree = "<group>";
125-
};
126107
529226C91C85F68000C89379 = {
127108
isa = PBXGroup;
128109
children = (
@@ -134,7 +115,6 @@
134115
9F3A08EC266978C300E1D69F /* integration_test_tvos */,
135116
529226D41C85F68000C89379 /* Frameworks */,
136117
529226D31C85F68000C89379 /* Products */,
137-
1A5183E5C501F81ED7C672DA /* Pods */,
138118
);
139119
sourceTree = "<group>";
140120
};
@@ -150,6 +130,7 @@
150130
529226D41C85F68000C89379 /* Frameworks */ = {
151131
isa = PBXGroup;
152132
children = (
133+
BCF6A9592682C2AB00578FDD /* Foundation.framework */,
153134
9F5DD09326697A5F0058C144 /* CoreGraphics.framework */,
154135
9F5DD09126697A170058C144 /* UIKit.framework */,
155136
D6E7D43C22D51D9900EDBD35 /* UserNotifications.framework */,
@@ -193,9 +174,7 @@
193174
isa = PBXGroup;
194175
children = (
195176
9F3A08F3266978C300E1D69F /* Main.storyboard */,
196-
9F3A08F6266978C400E1D69F /* Assets.xcassets */,
197177
9F3A08F8266978C400E1D69F /* LaunchScreen.storyboard */,
198-
9F3A08FB266978C400E1D69F /* Info.plist */,
199178
);
200179
path = integration_test_tvos;
201180
sourceTree = "<group>";
@@ -305,7 +284,6 @@
305284
files = (
306285
9F5DD09926697AD30058C144 /* GoogleService-Info.plist in Resources */,
307286
9F3A08FA266978C400E1D69F /* LaunchScreen.storyboard in Resources */,
308-
9F3A08F7266978C400E1D69F /* Assets.xcassets in Resources */,
309287
9F3A08F5266978C300E1D69F /* Main.storyboard in Resources */,
310288
);
311289
runOnlyForDeploymentPostprocessing = 0;
@@ -491,7 +469,6 @@
491469
};
492470
529226FA1C85F68000C89379 /* Debug */ = {
493471
isa = XCBuildConfiguration;
494-
baseConfigurationReference = F56939B9262D9DAC1194ECAB /* Pods-integration_test.debug.xcconfig */;
495472
buildSettings = {
496473
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
497474
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -510,7 +487,6 @@
510487
"\"$(SRCROOT)/external/googletest/src/googlemock/include\"",
511488
"\"$(SRCROOT)/external/googletest/src/googletest\"",
512489
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
513-
/Users/drsanta/Downloads/firebase_cpp_sdk/xcframeworks_tvos/firebase.xcframework,
514490
);
515491
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
516492
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -523,7 +499,6 @@
523499
};
524500
529226FB1C85F68000C89379 /* Release */ = {
525501
isa = XCBuildConfiguration;
526-
baseConfigurationReference = 2584BCCABE98221F4709B89E /* Pods-integration_test.release.xcconfig */;
527502
buildSettings = {
528503
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
529504
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -542,7 +517,6 @@
542517
"\"$(SRCROOT)/external/googletest/src/googlemock/include\"",
543518
"\"$(SRCROOT)/external/googletest/src/googletest\"",
544519
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
545-
/Users/drsanta/Downloads/firebase_cpp_sdk/xcframeworks_tvos/firebase.xcframework,
546520
);
547521
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
548522
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -555,7 +529,6 @@
555529
};
556530
9F3A08FE266978C400E1D69F /* Debug */ = {
557531
isa = XCBuildConfiguration;
558-
baseConfigurationReference = 5DEB90B0D272D92969404783 /* Pods-integration_test_tvos.debug.xcconfig */;
559532
buildSettings = {
560533
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
561534
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -601,13 +574,12 @@
601574
PRODUCT_NAME = "$(TARGET_NAME)";
602575
SDKROOT = appletvos;
603576
TARGETED_DEVICE_FAMILY = 3;
604-
TVOS_DEPLOYMENT_TARGET = 14.5;
577+
TVOS_DEPLOYMENT_TARGET = 10.1;
605578
};
606579
name = Debug;
607580
};
608581
9F3A08FF266978C400E1D69F /* Release */ = {
609582
isa = XCBuildConfiguration;
610-
baseConfigurationReference = 9C11DDB75B69AFC403F349C3 /* Pods-integration_test_tvos.release.xcconfig */;
611583
buildSettings = {
612584
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
613585
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -651,7 +623,7 @@
651623
PRODUCT_NAME = "$(TARGET_NAME)";
652624
SDKROOT = appletvos;
653625
TARGETED_DEVICE_FAMILY = 3;
654-
TVOS_DEPLOYMENT_TARGET = 14.5;
626+
TVOS_DEPLOYMENT_TARGET = 10.1;
655627
};
656628
name = Release;
657629
};

auth/integration_test/integration_test_tvos/Assets.xcassets/AccentColor.colorset/Contents.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Contents.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

auth/integration_test/integration_test_tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)