Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates iOS dependency to adopt privacy manifests #30

Merged
merged 2 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions Example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,14 @@ PODS:
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- google-cast-sdk (4.8.0):
- google-cast-sdk/Core (= 4.8.0)
- google-cast-sdk (4.8.1):
- Protobuf (~> 3.13)
- google-cast-sdk/Core (4.8.0):
- Protobuf (~> 3.13)
- GoogleAds-IMA-iOS-SDK (3.19.2)
- GoogleAds-IMA-iOS-SDK (3.22.0)
- hermes-engine (0.70.14)
- JWPlayerKit (4.18.0)
- JWPlayerKit (4.19.1)
- libevent (2.1.12)
- OpenSSL-Universal (1.1.1100)
- Protobuf (3.26.0)
- Protobuf (3.26.1)
- RCT-Folly (2021.07.22.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -389,9 +386,9 @@ PODS:
- RNGestureHandler (2.12.1):
- React-Core
- RNJWPlayer (1.0.0):
- google-cast-sdk (~> 4.8)
- GoogleAds-IMA-iOS-SDK (~> 3.19.1)
- JWPlayerKit (~> 4.18.0)
- google-cast-sdk (= 4.8.1)
- GoogleAds-IMA-iOS-SDK (= 3.22.0)
- JWPlayerKit (>= 4.19.0)
- React-Core
- RNScreens (3.25.0):
- React-Core
Expand Down Expand Up @@ -600,13 +597,13 @@ SPEC CHECKSUMS:
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
google-cast-sdk: afeb1aac0744b1bc4f70bc3db8468e33fabbff38
GoogleAds-IMA-iOS-SDK: 0e817c05ab26f1b9285c80f4a75e1350a916d50b
google-cast-sdk: beb7a3ec3def0e3beb618a849b0f1ab2b15b5ebb
GoogleAds-IMA-iOS-SDK: e594350077f2838a335b40de079a12f0a16e1f6d
hermes-engine: af3982923f6d1af884ece80592bd40be2c62e064
JWPlayerKit: 0c13ade17e66632456ce6d1b30b39fd7e80ecc30
JWPlayerKit: 77075dce53ed80374cd54dfbc50d16e7f8820480
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Protobuf: 5685c66a07eaad9d18ce5ab618e9ac01fd04b5aa
Protobuf: a53f5173a603075b3522a5c50be63a67a5f3353a
RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
RCTRequired: 6f42727926c2ef4836fc23169586f3d8d7f5a6e4
RCTTypeSafety: de9b538a8f20ae8c780bf38935f37f303b083fc8
Expand Down Expand Up @@ -640,7 +637,7 @@ SPEC CHECKSUMS:
RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNJWPlayer: 94e48d2483f63b7070905cd7200cd58b049426fc
RNJWPlayer: 323daf0420cc1181f4fa25866cab4b480ecc7ff1
RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Expand Down
12 changes: 10 additions & 2 deletions Example/ios/RNJWPlayer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,11 @@
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
};
Expand Down Expand Up @@ -764,7 +768,11 @@
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
6 changes: 3 additions & 3 deletions RNJWPlayer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.platform = :ios, "14.0"
s.source = { :git => "https://github.com/jwplayer/jwplayer-react-native.git", :tag => "v#{s.version}" }
s.source_files = "ios/RNJWPlayer/*.{h,m,swift}"
s.dependency 'JWPlayerKit', '~> 4.18.0'
s.dependency 'JWPlayerKit', '>= 4.19.0'
s.dependency 'React-Core'
s.static_framework = true
s.info_plist = {
Expand All @@ -28,14 +28,14 @@ Pod::Spec.new do |s|

if defined?($RNJWPlayerUseGoogleCast)
Pod::UI.puts "RNJWPlayer: enable Google Cast"
s.dependency 'google-cast-sdk', '~> 4.8'
s.dependency 'google-cast-sdk', '4.8.1'
s.pod_target_xcconfig = {
'OTHER_SWIFT_FLAGS' => '$(inherited) -D USE_GOOGLE_CAST'
}
end
if defined?($RNJWPlayerUseGoogleIMA)
Pod::UI.puts "RNJWPlayer: enable IMA SDK"
s.dependency 'GoogleAds-IMA-iOS-SDK', '~>3.19.1'
s.dependency 'GoogleAds-IMA-iOS-SDK', '3.22.0'
s.pod_target_xcconfig = {
'OTHER_SWIFT_FLAGS' => '$(inherited) -D USE_GOOGLE_IMA'
}
Expand Down