Skip to content

Commit 1de37e1

Browse files
committed
cleanup firestore integration test for tvos
removed workspace directory removed tvos specific assets and plist file sharing ios plist file with tvos target set tvos deployment target to 10.1
1 parent 162e6f4 commit 1de37e1

File tree

23 files changed

+4
-310
lines changed

23 files changed

+4
-310
lines changed

firestore/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D91C85F68000C89379 /* UIKit.framework */; };
1515
8FE0839D2B60C8CB9E84808C /* libPods-integration_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F6E59CEC74C199ECF8BB8BF /* libPods-integration_test.a */; };
1616
BC1D678326799F8C005DC2DA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC1D678126799F8C005DC2DA /* Main.storyboard */; };
17-
BC1D678526799F8D005DC2DA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BC1D678426799F8D005DC2DA /* Assets.xcassets */; };
1817
BC1D678826799F8D005DC2DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC1D678626799F8D005DC2DA /* LaunchScreen.storyboard */; };
1918
BC1D678F26799F9A005DC2DA /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
2019
BC1D679026799F9D005DC2DA /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
@@ -55,9 +54,7 @@
5554
B8017C9163F3D385CCDD3E9D /* 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>"; };
5655
BC1D677926799F8C005DC2DA /* integration_test_tvos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_tvos.app; sourceTree = BUILT_PRODUCTS_DIR; };
5756
BC1D678226799F8C005DC2DA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
58-
BC1D678426799F8D005DC2DA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5957
BC1D678726799F8D005DC2DA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
60-
BC1D678926799F8D005DC2DA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6158
BC1D67972679A00B005DC2DA /* 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; };
6259
BC1D67992679A012005DC2DA /* 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; };
6360
BC1D679B2679A017005DC2DA /* 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; };
@@ -194,9 +191,7 @@
194191
isa = PBXGroup;
195192
children = (
196193
BC1D678126799F8C005DC2DA /* Main.storyboard */,
197-
BC1D678426799F8D005DC2DA /* Assets.xcassets */,
198194
BC1D678626799F8D005DC2DA /* LaunchScreen.storyboard */,
199-
BC1D678926799F8D005DC2DA /* Info.plist */,
200195
);
201196
path = integration_test_tvos;
202197
sourceTree = "<group>";
@@ -296,7 +291,6 @@
296291
files = (
297292
BC1D67962679A005005DC2DA /* GoogleService-Info.plist in Resources */,
298293
BC1D678826799F8D005DC2DA /* LaunchScreen.storyboard in Resources */,
299-
BC1D678526799F8D005DC2DA /* Assets.xcassets in Resources */,
300294
BC1D678326799F8C005DC2DA /* Main.storyboard in Resources */,
301295
);
302296
runOnlyForDeploymentPostprocessing = 0;
@@ -619,7 +613,7 @@
619613
"\"$(SRCROOT)/external/googletest/src/googletest\"",
620614
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
621615
);
622-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
616+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
623617
LD_RUNPATH_SEARCH_PATHS = (
624618
"$(inherited)",
625619
"@executable_path/Frameworks",
@@ -631,7 +625,7 @@
631625
PROVISIONING_PROFILE_SPECIFIER = "";
632626
SDKROOT = appletvos;
633627
TARGETED_DEVICE_FAMILY = 3;
634-
TVOS_DEPLOYMENT_TARGET = 14.5;
628+
TVOS_DEPLOYMENT_TARGET = 10.1;
635629
};
636630
name = Debug;
637631
};
@@ -676,7 +670,7 @@
676670
"\"$(SRCROOT)/external/googletest/src/googletest\"",
677671
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
678672
);
679-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
673+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
680674
LD_RUNPATH_SEARCH_PATHS = (
681675
"$(inherited)",
682676
"@executable_path/Frameworks",
@@ -687,7 +681,7 @@
687681
PROVISIONING_PROFILE_SPECIFIER = "";
688682
SDKROOT = appletvos;
689683
TARGETED_DEVICE_FAMILY = 3;
690-
TVOS_DEPLOYMENT_TARGET = 14.5;
684+
TVOS_DEPLOYMENT_TARGET = 10.1;
691685
};
692686
name = Release;
693687
};

firestore/integration_test/integration_test.xcworkspace/contents.xcworkspacedata

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

firestore/integration_test/integration_test.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

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

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

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

firestore/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.

firestore/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.

firestore/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.

firestore/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.

firestore/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.

firestore/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.

0 commit comments

Comments
 (0)