Skip to content

Commit 9bbeb44

Browse files
committed
Update settings for LGCast
1 parent d031de1 commit 9bbeb44

File tree

2 files changed

+42
-34
lines changed

2 files changed

+42
-34
lines changed

ConnectSDK.podspec

+3-7
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,13 @@ Pod::Spec.new do |s|
8989

9090
s.subspec 'Core' do |sp|
9191
sp.source_files = "ConnectSDKDefaultPlatforms.h", "core/**/*.{h,m}"
92-
sp.exclude_files = (non_arc_files.dup << "core/ConnectSDK*Tests/**/*")
92+
sp.exclude_files = (non_arc_files.dup << "core/ConnectSDK*Tests/**/*" << "core/Frameworks/LGCast/**/*.h")
9393
sp.private_header_files = "core/**/*_Private.h"
9494
sp.requires_arc = true
9595

9696
sp.dependency 'ConnectSDK/no-arc'
97-
sp.ios.vendored_frameworks = 'core/Frameworks/LGCast/LGCast.framework', 'core/Frameworks/LGCast/GStreamerForLGCast.framework'
98-
99-
sp.preserve_path = 'core/Frameworks/LGCast/*.framework'
100-
sp.xcconfig = {
101-
"HEADER_SEARCH_PATHS" => '"$(PODS_ROOT)/ConnectSDK/core/Frameworks/LGCast/LGCast.framework/Headers" "$(PODS_ROOT)/ConnectSDK/core/Frameworks/LGCast/GStreamerForLGCast.framework/Headers"',
102-
}
97+
sp.ios.vendored_frameworks = 'core/Frameworks/LGCast/LGCast.xcframework', 'core/Frameworks/LGCast/GStreamerForLGCast.xcframework'
98+
sp.preserve_paths = 'core/Frameworks/LGCast/LGCast.xcframework', 'core/Frameworks/LGCast/GStreamerForLGCast.xcframework'
10399
end
104100

105101
s.subspec 'no-arc' do |sp|

ConnectSDK.xcodeproj/project.pbxproj

+39-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -26,8 +26,6 @@
2626
0F446CC91A6D924D000BB1C0 /* MediaLaunchObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F446CC71A6D924D000BB1C0 /* MediaLaunchObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
2727
0F446CCA1A6D924D000BB1C0 /* MediaLaunchObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F446CC81A6D924D000BB1C0 /* MediaLaunchObject.m */; };
2828
146A7D1B1B2896C300260441 /* FireTVIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 146A7D1A1B2896C300260441 /* FireTVIntegrationTests.m */; };
29-
22D1EDA1282D0F9600D74B56 /* LGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1ED9F282D0F9600D74B56 /* LGCast.framework */; };
30-
22D1EDA2282D0F9600D74B56 /* GStreamerForLGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */; };
3129
22D1EDBB282D0FBD00D74B56 /* WebOSTVService+LGCast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDA4282D0FBD00D74B56 /* WebOSTVService+LGCast.h */; settings = {ATTRIBUTES = (Public, ); }; };
3230
22D1EDBC282D0FBD00D74B56 /* ConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDA5282D0FBD00D74B56 /* ConnectionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
3331
22D1EDBD282D0FBD00D74B56 /* CameraSinkCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDA7282D0FBD00D74B56 /* CameraSinkCapability.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -50,12 +48,8 @@
5048
22D1EDCE282D0FBD00D74B56 /* MirroringSourceCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDBA282D0FBD00D74B56 /* MirroringSourceCapability.h */; settings = {ATTRIBUTES = (Public, ); }; };
5149
22D1EDD1282D101300D74B56 /* ScreenMirroringControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDCF282D101300D74B56 /* ScreenMirroringControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
5250
22D1EDD2282D101300D74B56 /* RemoteCameraControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 22D1EDD0282D101300D74B56 /* RemoteCameraControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
53-
22D1EDD3282D149800D74B56 /* GStreamerForLGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */; };
54-
22D1EDD4282D149800D74B56 /* LGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1ED9F282D0F9600D74B56 /* LGCast.framework */; };
55-
22D1EDD5282D14A000D74B56 /* GStreamerForLGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */; };
56-
22D1EDD6282D14A000D74B56 /* LGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1ED9F282D0F9600D74B56 /* LGCast.framework */; };
57-
22D1EDD7282D14A500D74B56 /* GStreamerForLGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */; };
58-
22D1EDD8282D14A500D74B56 /* LGCast.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1ED9F282D0F9600D74B56 /* LGCast.framework */; };
51+
22E63EB5293DD36D00080ECB /* GStreamerForLGCast.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E63EB3293DD36C00080ECB /* GStreamerForLGCast.xcframework */; };
52+
22E63EB6293DD36D00080ECB /* LGCast.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E63EB4293DD36C00080ECB /* LGCast.xcframework */; };
5953
440A031D1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 440A031C1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m */; };
6054
44166C561B4203880052F9EC /* libConnectSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA61EB1018FE485B00D75696 /* libConnectSDK.a */; };
6155
44166C5C1B420B6A0052F9EC /* AirPlayServiceAcceptanceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 44E98F991B1E733D0043BC70 /* AirPlayServiceAcceptanceTests.m */; };
@@ -441,8 +435,6 @@
441435
0F446CC71A6D924D000BB1C0 /* MediaLaunchObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaLaunchObject.h; sourceTree = "<group>"; };
442436
0F446CC81A6D924D000BB1C0 /* MediaLaunchObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaLaunchObject.m; sourceTree = "<group>"; };
443437
146A7D1A1B2896C300260441 /* FireTVIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FireTVIntegrationTests.m; sourceTree = "<group>"; };
444-
22D1ED9F282D0F9600D74B56 /* LGCast.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LGCast.framework; path = core/Frameworks/LGCast/LGCast.framework; sourceTree = "<group>"; };
445-
22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GStreamerForLGCast.framework; path = core/Frameworks/LGCast/GStreamerForLGCast.framework; sourceTree = "<group>"; };
446438
22D1EDA4282D0FBD00D74B56 /* WebOSTVService+LGCast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WebOSTVService+LGCast.h"; sourceTree = "<group>"; };
447439
22D1EDA5282D0FBD00D74B56 /* ConnectionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConnectionManager.h; sourceTree = "<group>"; };
448440
22D1EDA7282D0FBD00D74B56 /* CameraSinkCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraSinkCapability.h; sourceTree = "<group>"; };
@@ -465,6 +457,8 @@
465457
22D1EDBA282D0FBD00D74B56 /* MirroringSourceCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MirroringSourceCapability.h; sourceTree = "<group>"; };
466458
22D1EDCF282D101300D74B56 /* ScreenMirroringControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenMirroringControl.h; sourceTree = "<group>"; };
467459
22D1EDD0282D101300D74B56 /* RemoteCameraControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCameraControl.h; sourceTree = "<group>"; };
460+
22E63EB3293DD36C00080ECB /* GStreamerForLGCast.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GStreamerForLGCast.xcframework; path = core/Frameworks/LGCast/GStreamerForLGCast.xcframework; sourceTree = "<group>"; };
461+
22E63EB4293DD36C00080ECB /* LGCast.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = LGCast.xcframework; path = core/Frameworks/LGCast/LGCast.xcframework; sourceTree = "<group>"; };
468462
440A031C1A854EDE0007E3D3 /* WebOSTVServiceSocketClientTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebOSTVServiceSocketClientTests.m; sourceTree = "<group>"; };
469463
440A031E1A85536A0007E3D3 /* WebOSTVServiceSocketClient_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebOSTVServiceSocketClient_Private.h; sourceTree = "<group>"; };
470464
44166C501B4203880052F9EC /* ConnectSDKAcceptanceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConnectSDKAcceptanceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -821,8 +815,6 @@
821815
44166C691B420DC20052F9EC /* libicucore.dylib in Frameworks */,
822816
44166C651B420DA60052F9EC /* AmazonFling.framework in Frameworks */,
823817
44166C621B420C550052F9EC /* libz.dylib in Frameworks */,
824-
22D1EDD7282D14A500D74B56 /* GStreamerForLGCast.framework in Frameworks */,
825-
22D1EDD8282D14A500D74B56 /* LGCast.framework in Frameworks */,
826818
);
827819
runOnlyForDeploymentPostprocessing = 0;
828820
};
@@ -845,8 +837,6 @@
845837
44316F2B1AF3F17A000FE655 /* OHHTTPStubs.framework in Frameworks */,
846838
44316F291AF3F17A000FE655 /* OCMock.framework in Frameworks */,
847839
44EF618F1A12E0A400CF344C /* libz.dylib in Frameworks */,
848-
22D1EDD3282D149800D74B56 /* GStreamerForLGCast.framework in Frameworks */,
849-
22D1EDD4282D149800D74B56 /* LGCast.framework in Frameworks */,
850840
);
851841
runOnlyForDeploymentPostprocessing = 0;
852842
};
@@ -867,8 +857,6 @@
867857
449A371C1B0FE3A500E47DAC /* MobileCoreServices.framework in Frameworks */,
868858
449A37171B0FE36E00E47DAC /* Bolts.framework in Frameworks */,
869859
449A37181B0FE37100E47DAC /* AmazonFling.framework in Frameworks */,
870-
22D1EDD5282D14A000D74B56 /* GStreamerForLGCast.framework in Frameworks */,
871-
22D1EDD6282D14A000D74B56 /* LGCast.framework in Frameworks */,
872860
);
873861
runOnlyForDeploymentPostprocessing = 0;
874862
};
@@ -881,8 +869,8 @@
881869
EA61EBF218FE48EF00D75696 /* MobileCoreServices.framework in Frameworks */,
882870
EA61EBF018FE48E900D75696 /* SystemConfiguration.framework in Frameworks */,
883871
EA61EB1418FE485B00D75696 /* Foundation.framework in Frameworks */,
884-
22D1EDA1282D0F9600D74B56 /* LGCast.framework in Frameworks */,
885-
22D1EDA2282D0F9600D74B56 /* GStreamerForLGCast.framework in Frameworks */,
872+
22E63EB5293DD36D00080ECB /* GStreamerForLGCast.xcframework in Frameworks */,
873+
22E63EB6293DD36D00080ECB /* LGCast.xcframework in Frameworks */,
886874
);
887875
runOnlyForDeploymentPostprocessing = 0;
888876
};
@@ -1772,8 +1760,8 @@
17721760
EA61EB1218FE485B00D75696 /* Frameworks */ = {
17731761
isa = PBXGroup;
17741762
children = (
1775-
22D1EDA0282D0F9600D74B56 /* GStreamerForLGCast.framework */,
1776-
22D1ED9F282D0F9600D74B56 /* LGCast.framework */,
1763+
22E63EB3293DD36C00080ECB /* GStreamerForLGCast.xcframework */,
1764+
22E63EB4293DD36C00080ECB /* LGCast.xcframework */,
17771765
44EF619A1A12E23200CF344C /* libicucore.dylib */,
17781766
44EF61971A12E1C800CF344C /* MediaAccessibility.framework */,
17791767
44EF618E1A12E0A400CF344C /* libz.dylib */,
@@ -2374,7 +2362,11 @@
23742362
);
23752363
INFOPLIST_FILE = core/ConnectSDKAcceptanceTests/Info.plist;
23762364
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
2377-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2365+
LD_RUNPATH_SEARCH_PATHS = (
2366+
"$(inherited)",
2367+
"@executable_path/Frameworks",
2368+
"@loader_path/Frameworks",
2369+
);
23782370
MTL_ENABLE_DEBUG_INFO = YES;
23792371
OTHER_LDFLAGS = (
23802372
"$(inherited)",
@@ -2408,7 +2400,11 @@
24082400
GCC_PREFIX_HEADER = "core/ConnectSDKIntegrationTests/ConnectSDKIntegrationTests-Prefix.pch";
24092401
INFOPLIST_FILE = core/ConnectSDKAcceptanceTests/Info.plist;
24102402
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
2411-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2403+
LD_RUNPATH_SEARCH_PATHS = (
2404+
"$(inherited)",
2405+
"@executable_path/Frameworks",
2406+
"@loader_path/Frameworks",
2407+
);
24122408
MTL_ENABLE_DEBUG_INFO = NO;
24132409
OTHER_LDFLAGS = (
24142410
"$(inherited)",
@@ -2443,7 +2439,11 @@
24432439
);
24442440
INFOPLIST_FILE = core/ConnectSDKTests/SupportingFiles/Info.plist;
24452441
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
2446-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2442+
LD_RUNPATH_SEARCH_PATHS = (
2443+
"$(inherited)",
2444+
"@executable_path/Frameworks",
2445+
"@loader_path/Frameworks",
2446+
);
24472447
MTL_ENABLE_DEBUG_INFO = YES;
24482448
OTHER_LDFLAGS = (
24492449
"$(inherited)",
@@ -2474,7 +2474,11 @@
24742474
GCC_PREFIX_HEADER = "core/ConnectSDKTests/ConnectSDKTests-Prefix.pch";
24752475
INFOPLIST_FILE = core/ConnectSDKTests/SupportingFiles/Info.plist;
24762476
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
2477-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2477+
LD_RUNPATH_SEARCH_PATHS = (
2478+
"$(inherited)",
2479+
"@executable_path/Frameworks",
2480+
"@loader_path/Frameworks",
2481+
);
24782482
MTL_ENABLE_DEBUG_INFO = NO;
24792483
OTHER_LDFLAGS = (
24802484
"$(inherited)",
@@ -2512,7 +2516,11 @@
25122516
);
25132517
INFOPLIST_FILE = core/ConnectSDKIntegrationTests/Info.plist;
25142518
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
2515-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2519+
LD_RUNPATH_SEARCH_PATHS = (
2520+
"$(inherited)",
2521+
"@executable_path/Frameworks",
2522+
"@loader_path/Frameworks",
2523+
);
25162524
MTL_ENABLE_DEBUG_INFO = YES;
25172525
OTHER_LDFLAGS = (
25182526
"$(inherited)",
@@ -2547,7 +2555,11 @@
25472555
GCC_PREFIX_HEADER = "core/ConnectSDKIntegrationTests/ConnectSDKIntegrationTests-Prefix.pch";
25482556
INFOPLIST_FILE = core/ConnectSDKIntegrationTests/Info.plist;
25492557
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
2550-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2558+
LD_RUNPATH_SEARCH_PATHS = (
2559+
"$(inherited)",
2560+
"@executable_path/Frameworks",
2561+
"@loader_path/Frameworks",
2562+
);
25512563
MTL_ENABLE_DEBUG_INFO = NO;
25522564
OTHER_LDFLAGS = (
25532565
"$(inherited)",

0 commit comments

Comments
 (0)