Skip to content

Commit 4a9eba5

Browse files
committed
cleanup database integration test for tvos
added Google-ServiceInfo.plist to Copy Bundle files added frameworks removed tvos specific assets and plist file sharing ios plist file with tvos target set tvos deployment target to 10.1
1 parent 1de37e1 commit 4a9eba5

File tree

21 files changed

+18
-292
lines changed

21 files changed

+18
-292
lines changed

database/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D71C85F68000C89379 /* CoreGraphics.framework */; };
1313
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D91C85F68000C89379 /* UIKit.framework */; };
1414
9F2ABA30267A4720001A35CE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA2E267A4720001A35CE /* Main.storyboard */; };
15-
9F2ABA32267A4721001A35CE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA31267A4721001A35CE /* Assets.xcassets */; };
1615
9F2ABA35267A4721001A35CE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F2ABA33267A4721001A35CE /* LaunchScreen.storyboard */; };
1716
9F2ABA3C267A4744001A35CE /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
1817
9F2ABA3E267A4747001A35CE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
@@ -21,6 +20,10 @@
2120
9F2ABA41267A474F001A35CE /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
2221
9F4C472E267A4DB6001E25DA /* ios_app_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E722CB322900C2651A /* ios_app_framework.mm */; };
2322
9F4C472F267A4DC0001E25DA /* ios_firebase_test_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E822CB322900C2651A /* ios_firebase_test_framework.mm */; };
23+
BCF6A94C2682C02800578FDD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520BC0381C869159008CFBC3 /* GoogleService-Info.plist */; };
24+
BCF6A94E2682C02E00578FDD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF6A94D2682C02E00578FDD /* Foundation.framework */; };
25+
BCF6A9502682C03300578FDD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF6A94F2682C03300578FDD /* CoreGraphics.framework */; };
26+
BCF6A9522682C03700578FDD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF6A9512682C03700578FDD /* UIKit.framework */; };
2427
D61C5F8E22BABA9C00A79141 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D61C5F8C22BABA9B00A79141 /* Images.xcassets */; };
2528
D61C5F9622BABAD200A79141 /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
2629
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
@@ -41,9 +44,10 @@
4144
529226EE1C85F68000C89379 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
4245
9F2ABA26267A4720001A35CE /* integration_test_tvos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_tvos.app; sourceTree = BUILT_PRODUCTS_DIR; };
4346
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>"; };
4547
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>"; };
48+
BCF6A94D2682C02E00578FDD /* 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; };
49+
BCF6A94F2682C03300578FDD /* 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; };
50+
BCF6A9512682C03700578FDD /* 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; };
4751
D61C5F8C22BABA9B00A79141 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4852
D61C5F8D22BABA9C00A79141 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4953
D61C5F9222BABAD100A79141 /* integration_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = integration_test.cc; path = src/integration_test.cc; sourceTree = "<group>"; };
@@ -75,6 +79,9 @@
7579
isa = PBXFrameworksBuildPhase;
7680
buildActionMask = 2147483647;
7781
files = (
82+
BCF6A9522682C03700578FDD /* UIKit.framework in Frameworks */,
83+
BCF6A9502682C03300578FDD /* CoreGraphics.framework in Frameworks */,
84+
BCF6A94E2682C02E00578FDD /* Foundation.framework in Frameworks */,
7885
);
7986
runOnlyForDeploymentPostprocessing = 0;
8087
};
@@ -107,7 +114,10 @@
107114
529226D41C85F68000C89379 /* Frameworks */ = {
108115
isa = PBXGroup;
109116
children = (
117+
BCF6A9512682C03700578FDD /* UIKit.framework */,
118+
BCF6A94F2682C03300578FDD /* CoreGraphics.framework */,
110119
529226D51C85F68000C89379 /* Foundation.framework */,
120+
BCF6A94D2682C02E00578FDD /* Foundation.framework */,
111121
529226D71C85F68000C89379 /* CoreGraphics.framework */,
112122
529226D91C85F68000C89379 /* UIKit.framework */,
113123
529226EE1C85F68000C89379 /* XCTest.framework */,
@@ -145,9 +155,7 @@
145155
isa = PBXGroup;
146156
children = (
147157
9F2ABA2E267A4720001A35CE /* Main.storyboard */,
148-
9F2ABA31267A4721001A35CE /* Assets.xcassets */,
149158
9F2ABA33267A4721001A35CE /* LaunchScreen.storyboard */,
150-
9F2ABA36267A4721001A35CE /* Info.plist */,
151159
);
152160
path = integration_test_tvos;
153161
sourceTree = "<group>";
@@ -244,8 +252,8 @@
244252
isa = PBXResourcesBuildPhase;
245253
buildActionMask = 2147483647;
246254
files = (
255+
BCF6A94C2682C02800578FDD /* GoogleService-Info.plist in Resources */,
247256
9F2ABA35267A4721001A35CE /* LaunchScreen.storyboard in Resources */,
248-
9F2ABA32267A4721001A35CE /* Assets.xcassets in Resources */,
249257
9F2ABA30267A4720001A35CE /* Main.storyboard in Resources */,
250258
);
251259
runOnlyForDeploymentPostprocessing = 0;
@@ -478,15 +486,15 @@
478486
"\"$(SRCROOT)/external/googletest/src/googletest\"",
479487
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
480488
);
481-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
489+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
482490
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
483491
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
484492
MTL_FAST_MATH = YES;
485493
PRODUCT_BUNDLE_IDENTIFIER = "com.google.ios.database.testapp.integration-test-tvos";
486494
PRODUCT_NAME = "$(TARGET_NAME)";
487495
SDKROOT = appletvos;
488496
TARGETED_DEVICE_FAMILY = 3;
489-
TVOS_DEPLOYMENT_TARGET = 14.5;
497+
TVOS_DEPLOYMENT_TARGET = 10.1;
490498
};
491499
name = Debug;
492500
};
@@ -528,14 +536,14 @@
528536
"\"$(SRCROOT)/external/googletest/src/googletest\"",
529537
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
530538
);
531-
INFOPLIST_FILE = integration_test_tvos/Info.plist;
539+
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
532540
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
533541
MTL_FAST_MATH = YES;
534542
PRODUCT_BUNDLE_IDENTIFIER = "com.google.ios.database.testapp.integration-test-tvos";
535543
PRODUCT_NAME = "$(TARGET_NAME)";
536544
SDKROOT = appletvos;
537545
TARGETED_DEVICE_FAMILY = 3;
538-
TVOS_DEPLOYMENT_TARGET = 14.5;
546+
TVOS_DEPLOYMENT_TARGET = 10.1;
539547
};
540548
name = Release;
541549
};

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)