Skip to content

Commit 07bb73b

Browse files
committed
cleaning up storage tvos integration test
Removed xcworkspace Removed Assets icons and images resources Sharing a single plist file between ios and tvos
1 parent 4982bc4 commit 07bb73b

File tree

23 files changed

+11
-315
lines changed

23 files changed

+11
-315
lines changed

storage/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D71C85F68000C89379 /* CoreGraphics.framework */; };
1414
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D91C85F68000C89379 /* UIKit.framework */; };
1515
BC1D66962679868A005DC2DA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC1D66942679868A005DC2DA /* Main.storyboard */; };
16-
BC1D66982679868B005DC2DA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BC1D66972679868B005DC2DA /* Assets.xcassets */; };
1716
BC1D669B2679868B005DC2DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC1D66992679868B005DC2DA /* LaunchScreen.storyboard */; };
1817
BC1D66A2267986B9005DC2DA /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
1918
BC1D66A3267986BB005DC2DA /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
@@ -50,7 +49,6 @@
5049
B68CDE4B846F7B54E7421D3A /* libPods-integration_test_tvos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test_tvos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5150
BC1D668C2679868A005DC2DA /* integration_test_tvos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_tvos.app; sourceTree = BUILT_PRODUCTS_DIR; };
5251
BC1D66952679868A005DC2DA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
53-
BC1D66972679868B005DC2DA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5452
BC1D669A2679868B005DC2DA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5553
BC1D669C2679868B005DC2DA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5654
BC1D66A7267987A2005DC2DA /* 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; };
@@ -181,7 +179,6 @@
181179
isa = PBXGroup;
182180
children = (
183181
BC1D66942679868A005DC2DA /* Main.storyboard */,
184-
BC1D66972679868B005DC2DA /* Assets.xcassets */,
185182
BC1D66992679868B005DC2DA /* LaunchScreen.storyboard */,
186183
BC1D669C2679868B005DC2DA /* Info.plist */,
187184
);
@@ -255,7 +252,7 @@
255252
BC1D668B2679868A005DC2DA = {
256253
CreatedOnToolsVersion = 12.5;
257254
DevelopmentTeam = EQHXZ8M8AV;
258-
ProvisioningStyle = Manual;
255+
ProvisioningStyle = Automatic;
259256
};
260257
};
261258
};
@@ -295,7 +292,6 @@
295292
buildActionMask = 2147483647;
296293
files = (
297294
BC1D669B2679868B005DC2DA /* LaunchScreen.storyboard in Resources */,
298-
BC1D66982679868B005DC2DA /* Assets.xcassets in Resources */,
299295
BC1D66962679868A005DC2DA /* Main.storyboard in Resources */,
300296
BC1D66AD267987BF005DC2DA /* GoogleService-Info.plist in Resources */,
301297
);
@@ -562,10 +558,10 @@
562558
CLANG_WARN_STRICT_PROTOTYPES = YES;
563559
CLANG_WARN_SUSPICIOUS_MOVE = YES;
564560
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
565-
CODE_SIGN_IDENTITY = "iPhone Developer";
566-
CODE_SIGN_STYLE = Manual;
561+
CODE_SIGN_IDENTITY = "Apple Development";
562+
CODE_SIGN_STYLE = Automatic;
567563
DEBUG_INFORMATION_FORMAT = dwarf;
568-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
564+
DEVELOPMENT_TEAM = "";
569565
ENABLE_TESTABILITY = YES;
570566
FRAMEWORK_SEARCH_PATHS = (
571567
"$(inherited)",
@@ -581,13 +577,13 @@
581577
"\"$(SRCROOT)/external/googletest/src/googletest\"",
582578
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
583579
);
584-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
580+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
585581
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
586582
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
587583
MTL_FAST_MATH = YES;
588584
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.cpp.storage.testapp.integration-test-tvos";
589585
PRODUCT_NAME = "$(TARGET_NAME)";
590-
PROVISIONING_PROFILE_SPECIFIER = "Google Development tvOS";
586+
PROVISIONING_PROFILE_SPECIFIER = "";
591587
SDKROOT = appletvos;
592588
TARGETED_DEVICE_FAMILY = 3;
593589
TVOS_DEPLOYMENT_TARGET = 14.5;
@@ -617,10 +613,10 @@
617613
CLANG_WARN_STRICT_PROTOTYPES = YES;
618614
CLANG_WARN_SUSPICIOUS_MOVE = YES;
619615
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
620-
CODE_SIGN_IDENTITY = "iPhone Developer";
621-
CODE_SIGN_STYLE = Manual;
616+
CODE_SIGN_IDENTITY = "Apple Development";
617+
CODE_SIGN_STYLE = Automatic;
622618
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
623-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
619+
DEVELOPMENT_TEAM = "";
624620
FRAMEWORK_SEARCH_PATHS = (
625621
"$(inherited)",
626622
"$(PROJECT_DIR)",
@@ -635,12 +631,12 @@
635631
"\"$(SRCROOT)/external/googletest/src/googletest\"",
636632
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
637633
);
638-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
634+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
639635
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
640636
MTL_FAST_MATH = YES;
641637
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.cpp.storage.testapp.integration-test-tvos";
642638
PRODUCT_NAME = "$(TARGET_NAME)";
643-
PROVISIONING_PROFILE_SPECIFIER = "Google Development tvOS";
639+
PROVISIONING_PROFILE_SPECIFIER = "";
644640
SDKROOT = appletvos;
645641
TARGETED_DEVICE_FAMILY = 3;
646642
TVOS_DEPLOYMENT_TARGET = 14.5;

storage/integration_test/integration_test.xcworkspace/contents.xcworkspacedata

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

storage/integration_test/integration_test.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

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

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

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

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

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

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

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

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

storage/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)