From 3a5a3f79198306aaa86ce3ee0ed1113494bd8ec7 Mon Sep 17 00:00:00 2001 From: LamineNdy Date: Mon, 23 Nov 2020 10:54:15 +0100 Subject: [PATCH] Update DNA to 3.23 (#6) --- AVPlayerDNAPlugin.podspec | 7 +- Cartfile | 4 +- Cartfile.resolved | 4 +- PlayerDNAPlugin.xcodeproj/project.pbxproj | 96 ++++++++++++++++++++--- PlayerDNAPlugin/Info.plist | 2 +- Podfile | 3 +- Podfile.lock | 24 +++--- tmp.xcconfig | 2 + 8 files changed, 112 insertions(+), 30 deletions(-) create mode 100644 tmp.xcconfig diff --git a/AVPlayerDNAPlugin.podspec b/AVPlayerDNAPlugin.podspec index f35fa77..ceb8ac6 100644 --- a/AVPlayerDNAPlugin.podspec +++ b/AVPlayerDNAPlugin.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'AVPlayerDNAPlugin' - s.version = '1.1.22' - s.swift_version = '5.1' + s.version = '1.1.23' + s.swift_version = '5.3' s.summary = 'Streamroot Distributed Network Architecture AVPlayer plugins, a new way to deliver large-scale OTT video' s.homepage = 'https://www.streamroot.io/' s.author = { 'Name' => 'support-team@streamroot.io' } @@ -14,5 +14,6 @@ Pod::Spec.new do |s| s.source_files = 'PlayerDNAPlugin/Classes/*.swift' s.ios.deployment_target = '10.2' s.tvos.deployment_target = '10.2' - s.dependency 'StreamrootSDK', '~> 3.22.0' + s.dependency 'StreamrootSDK', '~> 3.23.1' + s.pod_target_xcconfig = { 'VALID_ARCHS' => 'x86_64 armv7 arm64' } end \ No newline at end of file diff --git a/Cartfile b/Cartfile index 48aca1e..8df9e46 100755 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ -binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.22.0 +binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.23.1 github "apple/swift-protobuf" "1.7.0" -github "daltoniam/Starscream" "3.1.1" +github "daltoniam/Starscream" "4.0.4" github "getsentry/sentry-cocoa" "5.1.4" diff --git a/Cartfile.resolved b/Cartfile.resolved index 396b37f..38f45c3 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.22" +binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.23.1" github "apple/swift-protobuf" "1.7.0" -github "daltoniam/Starscream" "3.1.1" +github "daltoniam/Starscream" "4.0.4" github "getsentry/sentry-cocoa" "5.1.4" diff --git a/PlayerDNAPlugin.xcodeproj/project.pbxproj b/PlayerDNAPlugin.xcodeproj/project.pbxproj index 9606c62..f2b2379 100644 --- a/PlayerDNAPlugin.xcodeproj/project.pbxproj +++ b/PlayerDNAPlugin.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 0B08BC745EC86DF83AEDBAD8 /* Pods_AVPlayerDNAPlugin_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB5C61A5A342453AECA4A6BC /* Pods_AVPlayerDNAPlugin_iOS.framework */; }; + 8C7C41A0F9564B1231C966FE /* Pods_AVPlayerDNAPlugin_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424908D8C9FDE264092D7AB3 /* Pods_AVPlayerDNAPlugin_tvOS.framework */; }; D6B14AB3218498D4008949EC /* AVPlayerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B14AB2218498D4008949EC /* AVPlayerPlugin.swift */; }; D6B14AB4218498D4008949EC /* AVPlayerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B14AB2218498D4008949EC /* AVPlayerPlugin.swift */; }; D6D3698722DF5FA00041F602 /* StreamrootSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6D3698322DF5FA00041F602 /* StreamrootSDK.framework */; }; @@ -45,6 +47,11 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 071F19DDCE75C3B70C23DE94 /* Pods-AVPlayerDNAPlugin-iOS.rc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-iOS.rc.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-iOS/Pods-AVPlayerDNAPlugin-iOS.rc.xcconfig"; sourceTree = ""; }; + 3AE41A6A9C23124D8C72B61E /* Pods-AVPlayerDNAPlugin-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-iOS.release.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-iOS/Pods-AVPlayerDNAPlugin-iOS.release.xcconfig"; sourceTree = ""; }; + 424908D8C9FDE264092D7AB3 /* Pods_AVPlayerDNAPlugin_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AVPlayerDNAPlugin_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BB7D16B4D2B9CFDEBE8B42E2 /* Pods-AVPlayerDNAPlugin-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-tvOS.release.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-tvOS/Pods-AVPlayerDNAPlugin-tvOS.release.xcconfig"; sourceTree = ""; }; + BC1D053F671EE5553770548D /* Pods-AVPlayerDNAPlugin-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-tvOS/Pods-AVPlayerDNAPlugin-tvOS.debug.xcconfig"; sourceTree = ""; }; D694E0AC225B454A00607784 /* StreamrootSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StreamrootSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D694E0AE225B455500607784 /* StreamrootSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StreamrootSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D6B14AB2218498D4008949EC /* AVPlayerPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerPlugin.swift; sourceTree = ""; }; @@ -67,6 +74,9 @@ D6DB317B2146AF9400403310 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; D6DB319E2146D9AD00403310 /* AVPlayerDNAPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AVPlayerDNAPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D6DB31A62146D9AD00403310 /* AVPlayerDNAPlugin-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AVPlayerDNAPlugin-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + DB5C61A5A342453AECA4A6BC /* Pods_AVPlayerDNAPlugin_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AVPlayerDNAPlugin_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F46B2990F4CADCF64E461467 /* Pods-AVPlayerDNAPlugin-tvOS.rc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-tvOS.rc.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-tvOS/Pods-AVPlayerDNAPlugin-tvOS.rc.xcconfig"; sourceTree = ""; }; + FF07247367205A96420F35B4 /* Pods-AVPlayerDNAPlugin-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AVPlayerDNAPlugin-iOS.debug.xcconfig"; path = "Target Support Files/Pods-AVPlayerDNAPlugin-iOS/Pods-AVPlayerDNAPlugin-iOS.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -78,6 +88,7 @@ D6D3698822DF5FA00041F602 /* Sentry.framework in Frameworks */, D6D3698922DF5FA00041F602 /* SwiftProtobuf.framework in Frameworks */, D6D3698A22DF5FA00041F602 /* Starscream.framework in Frameworks */, + 0B08BC745EC86DF83AEDBAD8 /* Pods_AVPlayerDNAPlugin_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -97,6 +108,7 @@ D6D3699022DF5FC60041F602 /* Sentry.framework in Frameworks */, D6D3699122DF5FC60041F602 /* SwiftProtobuf.framework in Frameworks */, D6D3699222DF5FC60041F602 /* StreamrootSDK.framework in Frameworks */, + 8C7C41A0F9564B1231C966FE /* Pods_AVPlayerDNAPlugin_tvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -114,6 +126,12 @@ 0046013680A00C68AD7D7FA6 /* Pods */ = { isa = PBXGroup; children = ( + FF07247367205A96420F35B4 /* Pods-AVPlayerDNAPlugin-iOS.debug.xcconfig */, + 3AE41A6A9C23124D8C72B61E /* Pods-AVPlayerDNAPlugin-iOS.release.xcconfig */, + 071F19DDCE75C3B70C23DE94 /* Pods-AVPlayerDNAPlugin-iOS.rc.xcconfig */, + BC1D053F671EE5553770548D /* Pods-AVPlayerDNAPlugin-tvOS.debug.xcconfig */, + BB7D16B4D2B9CFDEBE8B42E2 /* Pods-AVPlayerDNAPlugin-tvOS.release.xcconfig */, + F46B2990F4CADCF64E461467 /* Pods-AVPlayerDNAPlugin-tvOS.rc.xcconfig */, ); path = Pods; sourceTree = ""; @@ -183,6 +201,8 @@ D6D3698D22DF5FC60041F602 /* SwiftProtobuf.framework */, D6DB317B2146AF9400403310 /* AVKit.framework */, D6DB31792146AF9000403310 /* AVFoundation.framework */, + DB5C61A5A342453AECA4A6BC /* Pods_AVPlayerDNAPlugin_iOS.framework */, + 424908D8C9FDE264092D7AB3 /* Pods_AVPlayerDNAPlugin_tvOS.framework */, ); name = Frameworks; sourceTree = ""; @@ -213,6 +233,7 @@ isa = PBXNativeTarget; buildConfigurationList = D6DB31672146ACB400403310 /* Build configuration list for PBXNativeTarget "AVPlayerDNAPlugin-iOS" */; buildPhases = ( + 1D08FB6DDD52EB93ED8DCAA2 /* [CP] Check Pods Manifest.lock */, D6DB314E2146ACB300403310 /* Headers */, D6DB314F2146ACB300403310 /* Sources */, D6DB31502146ACB300403310 /* Frameworks */, @@ -249,6 +270,7 @@ isa = PBXNativeTarget; buildConfigurationList = D6DB31AF2146D9AD00403310 /* Build configuration list for PBXNativeTarget "AVPlayerDNAPlugin-tvOS" */; buildPhases = ( + 958C85CA625EF91E348CB0B8 /* [CP] Check Pods Manifest.lock */, D6DB31992146D9AD00403310 /* Headers */, D6DB319A2146D9AD00403310 /* Sources */, D6DB319B2146D9AD00403310 /* Frameworks */, @@ -357,6 +379,53 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 1D08FB6DDD52EB93ED8DCAA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-AVPlayerDNAPlugin-iOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 958C85CA625EF91E348CB0B8 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-AVPlayerDNAPlugin-tvOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ D6DB314F2146ACB300403310 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -470,6 +539,7 @@ }; D62CE964220C71DE006F0047 /* RC */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 071F19DDCE75C3B70C23DE94 /* Pods-AVPlayerDNAPlugin-iOS.rc.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -481,6 +551,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -493,7 +564,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -503,7 +574,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "arm64 arm64e armv7 armv7s"; }; name = RC; }; @@ -527,6 +597,7 @@ }; D62CE966220C71DE006F0047 /* RC */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F46B2990F4CADCF64E461467 /* Pods-AVPlayerDNAPlugin-tvOS.rc.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -538,6 +609,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=appletvsimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", @@ -549,7 +621,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -711,6 +783,7 @@ }; D6DB31682146ACB400403310 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FF07247367205A96420F35B4 /* Pods-AVPlayerDNAPlugin-iOS.debug.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = marker; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -722,6 +795,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -734,7 +808,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode-marker", @@ -744,12 +818,12 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "arm64 arm64e armv7 armv7s"; }; name = Debug; }; D6DB31692146ACB400403310 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3AE41A6A9C23124D8C72B61E /* Pods-AVPlayerDNAPlugin-iOS.release.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -761,6 +835,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -773,7 +848,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -783,7 +858,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "arm64 arm64e armv7 armv7s"; }; name = Release; }; @@ -825,6 +899,7 @@ }; D6DB31B02146D9AD00403310 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BC1D053F671EE5553770548D /* Pods-AVPlayerDNAPlugin-tvOS.debug.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = marker; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -836,6 +911,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=appletvsimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", @@ -847,7 +923,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode-marker", @@ -863,6 +939,7 @@ }; D6DB31B12146D9AD00403310 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BB7D16B4D2B9CFDEBE8B42E2 /* Pods-AVPlayerDNAPlugin-tvOS.release.xcconfig */; buildSettings = { BITCODE_GENERATION_MODE = bitcode; CLANG_ENABLE_CODE_COVERAGE = NO; @@ -874,6 +951,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=appletvsimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", @@ -885,7 +963,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.1.21; + MARKETING_VERSION = 1.1.23; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", diff --git a/PlayerDNAPlugin/Info.plist b/PlayerDNAPlugin/Info.plist index 05da7b7..53279c2 100644 --- a/PlayerDNAPlugin/Info.plist +++ b/PlayerDNAPlugin/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.22 + 1.1.23 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Podfile b/Podfile index 5faf082..5899724 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ def podCommon end target 'AVPlayerDNAPlugin-iOS' do - platform :ios, '9.2' + platform :ios, '10.2' podCommon end @@ -25,6 +25,7 @@ post_install do |installer| config.build_settings['CODE_SIGNING_REQUIRED'] = "NO" config.build_settings['CODE_SIGNING_ALLOWED'] = "NO" config.build_settings['ENABLE_BITCODE'] = "YES" + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" if config.name == "Debug" cflags = config.build_settings['OTHER_CFLAGS'] || ['$(inherited)'] cflags << '-fembed-bitcode-marker' diff --git a/Podfile.lock b/Podfile.lock index 1549081..c1b5864 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Sentry (4.4.0): - - Sentry/Core (= 4.4.0) - - Sentry/Core (4.4.0) - - Starscream (3.1.0) - - StreamrootSDK (3.18.0): - - Sentry (= 4.4.0) - - Starscream (= 3.1.0) + - Sentry (5.1.4): + - Sentry/Core (= 5.1.4) + - Sentry/Core (5.1.4) + - Starscream (4.0.4) + - StreamrootSDK (3.23.1): + - Sentry (= 5.1.4) + - Starscream (= 4.0.4) - SwiftProtobuf (= 1.7.0) - SwiftProtobuf (1.7.0) @@ -20,11 +20,11 @@ SPEC REPOS: - SwiftProtobuf SPEC CHECKSUMS: - Sentry: 26650184fe71eb7476dfd2737acb5ea6cc64b4b1 - Starscream: 08172b481e145289c4930cb567230fb55897cfa4 - StreamrootSDK: eeb4d9d454e9b3a36e902007c154cf9f6d7bff09 + Sentry: 74f2ad93a20a5567a1badaedf5b3f60b142ad082 + Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9 + StreamrootSDK: 47648658c2e0e05901c890f08656134d7976bd86 SwiftProtobuf: 4fd9645e69b72cbae6ec8da5be0cdd20ca6565dd -PODFILE CHECKSUM: 653f9a810ae92aef4ed13bac8c0964563b9702b2 +PODFILE CHECKSUM: 6de6729a20e28b250ada9a76b2311cc66336bbb0 -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.0 diff --git a/tmp.xcconfig b/tmp.xcconfig new file mode 100644 index 0000000..f5b2a4b --- /dev/null +++ b/tmp.xcconfig @@ -0,0 +1,2 @@ +EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 +EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)) \ No newline at end of file