Commit dbe7f0aa authored by 戴曦嘉's avatar 戴曦嘉
Browse files

1.4.10

parent de572775
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'BJPlayerManagerUI'
s.version = '1.4.9'
s.version = '1.4.10'
s.summary = 'BJPlayerManagerUI.'
# This description is used to generate tags and improve search results.
......@@ -44,7 +44,7 @@ TODO: Add long description of the pod here.
ss.dependency 'MBProgressHUD'
ss.dependency 'Masonry'
ss.dependency 'BJPlayerManagerCore', '~> 1.4.9'
ss.dependency 'BJPlayerManagerCore', '~> 1.4.12'
ss.dependency 'BJLiveBase/Masonry'
ss.prefix_header_contents =
......@@ -54,26 +54,4 @@ TODO: Add long description of the pod here.
'#import <BJPlayerManagerCore/BJPlayerManagerCore.h>'
end
# #依赖BJPlayerManagerCore/weak
s.subspec "weak" do |ss|
ss.source_files = 'BJPlayerManagerUI/Classes/**/*'
ss.resource_bundles = {
'BJPlayerManagerUI' => ['BJPlayerManagerUI/Assets/*.png']
}
ss.dependency 'MBProgressHUD'
ss.dependency 'Masonry'
ss.dependency 'BJPlayerManagerCore/weak', '~> 1.4.9'
ss.dependency 'BJLiveBase/Masonry'
ss.prefix_header_contents =
'#import <Masonry/Masonry.h>',
'#import <MBProgressHUD/MBProgressHUD.h>',
'#import <Masonry/Masonry.h>',
'#import <BJPlayerManagerCore/BJPlayerManagerCore.h>'
end
end
......@@ -367,10 +367,10 @@
6003F586195388D20070C39A /* Sources */,
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
8E81F516E9D49D755BABC8DD /* [CP] Embed Pods Frameworks */,
23B863DB0129BB23407F9A82 /* [CP] Copy Pods Resources */,
E0D9428F11890F2D024BEEB5 /* [CP-User] [BJLiveCore] Embed Frameworks */,
419C835DA92E97CE319C9F71 /* [CP-User] [BJLiveBase] Clear Archs From Frameworks */,
27DA18889A16F71E69C6F660 /* [CP-User] [BJVideoPlayerBase] Embed Frameworks */,
);
buildRules = (
);
......@@ -489,59 +489,60 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BJPlayerManagerUI_Example/Pods-BJPlayerManagerUI_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
2C8701E15A69B058575B496E /* [CP] Check Pods Manifest.lock */ = {
27DA18889A16F71E69C6F660 /* [CP-User] [BJVideoPlayerBase] Embed Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP-User] [BJVideoPlayerBase] Embed Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-BJPlayerManagerUI_Example-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";
shellScript = "../../BJVideoPlayerBase/frameworks/EmbedFrameworks.sh ../../BJVideoPlayerBase/frameworks\n";
showEnvVarsInLog = 0;
};
419C835DA92E97CE319C9F71 /* [CP-User] [BJLiveBase] Clear Archs From Frameworks */ = {
2C8701E15A69B058575B496E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP-User] [BJLiveBase] Clear Archs From Frameworks";
outputFileListPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-BJPlayerManagerUI_Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "../../BJLiveBase/script/ClearArchsFromFrameworks.sh \"BJHLMediaPlayer.framework\"";
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;
};
8E81F516E9D49D755BABC8DD /* [CP] Embed Pods Frameworks */ = {
419C835DA92E97CE319C9F71 /* [CP-User] [BJLiveBase] Clear Archs From Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-BJPlayerManagerUI_Example/Pods-BJPlayerManagerUI_Example-frameworks.sh",
"${PODS_ROOT}/../../../BJVideoPlayerBase/frameworks/BJYIJKMediaFramework.framework",
);
name = "[CP] Embed Pods Frameworks";
name = "[CP-User] [BJLiveBase] Clear Archs From Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BJYIJKMediaFramework.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BJPlayerManagerUI_Example/Pods-BJPlayerManagerUI_Example-frameworks.sh\"\n";
shellScript = "../../BJLiveBase/script/ClearArchsFromFrameworks.sh \"BJHLMediaPlayer.framework\" \"BJYIJKMediaFramework.framework\"";
showEnvVarsInLog = 0;
};
D709B53E0C3937C1DE0B42BA /* [CP] Check Pods Manifest.lock */ = {
......
......@@ -37,11 +37,16 @@ target 'BJPlayerManagerUI_Example' do
:name => '[BJLiveCore] Embed Frameworks',
:script => '../../BJLiveCore/frameworks/EmbedFrameworks.sh ../../BJLiveCore/frameworks', # for local BJLiveCore
:execution_position => :after_compile
script_phase \
:name => '[BJVideoPlayerBase] Embed Frameworks',
:script => '../../BJVideoPlayerBase/frameworks/EmbedFrameworks.sh ../../BJVideoPlayerBase/frameworks', # for local BJLiveCore
:execution_position => :after_compile
# #see https://stackoverflow.com/a/30866648/456536
script_phase \
:name => '[BJLiveBase] Clear Archs From Frameworks',
:script => '../../BJLiveBase/script/ClearArchsFromFrameworks.sh "BJHLMediaPlayer.framework"', # for local BJLiveBase
:script => '../../BJLiveBase/script/ClearArchsFromFrameworks.sh "BJHLMediaPlayer.framework" "BJYIJKMediaFramework.framework"', # for local BJLiveBase
:execution_position => :after_compile
pod 'MBProgressHUD', :inhibit_warnings => true
......
......@@ -51,17 +51,17 @@ PODS:
- BJLLogStat/static (0.9.1):
- BJLiveBase/Networking (~> 1.3.1)
- BJLLogStat/fmdb
- BJPlaybackCore (1.4.11):
- BJPlaybackCore/static (= 1.4.11)
- BJPlaybackCore/static (1.4.11):
- BJLiveBase (~> 1.3.9)
- BJPlaybackCore (1.4.12):
- BJPlaybackCore/static (= 1.4.12)
- BJPlaybackCore/static (1.4.12):
- BJLiveBase (~> 1.3.11)
- BJLiveBase/Base
- BJLiveBase/Ext
- BJLiveBase/Networking
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/YYModel
- BJLiveCore (~> 1.3.11)
- BJPlayerManagerCore (~> 1.4.11)
- BJLiveCore (~> 1.3.13)
- BJPlayerManagerCore (~> 1.4.12)
- BJPlaybackUI (1.4.9):
- BJPlaybackUI/static (= 1.4.9)
- BJPlaybackUI/static (1.4.9):
......@@ -70,28 +70,28 @@ PODS:
- BJPlaybackCore (~> 1.4.9)
- Masonry
- MBProgressHUD
- BJPlayerManagerCore (1.4.11):
- BJPlayerManagerCore/static (= 1.4.11)
- BJPlayerManagerCore/static (1.4.11):
- BJPlayerManagerCore (1.4.12):
- BJPlayerManagerCore/static (= 1.4.12)
- BJPlayerManagerCore/static (1.4.12):
- ASIHTTPRequest
- BJLiveBase (~> 1.3.9)
- BJLiveBase (~> 1.3.11)
- BJLiveBase/Base
- BJLiveBase/Networking
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/YYModel
- BJLLogStat (~> 0.9.1)
- BJVideoPlayer (~> 1.4.14)
- BJPlayerManagerUI (1.4.9):
- BJPlayerManagerUI/static (= 1.4.9)
- BJPlayerManagerUI/static (1.4.9):
- BJVideoPlayer (~> 1.4.16)
- BJPlayerManagerUI (1.4.10):
- BJPlayerManagerUI/static (= 1.4.10)
- BJPlayerManagerUI/static (1.4.10):
- BJLiveBase/Masonry
- BJPlayerManagerCore (~> 1.4.9)
- BJPlayerManagerCore (~> 1.4.12)
- Masonry
- MBProgressHUD
- BJVideoPlayer (1.4.15):
- BJVideoPlayer/static (= 1.4.15)
- BJVideoPlayer/BJYIJKMediaFramework (1.4.15)
- BJVideoPlayer/static (1.4.15):
- BJVideoPlayer (1.4.16):
- BJVideoPlayer/static (= 1.4.16)
- BJVideoPlayer/BJYIJKMediaFramework (1.4.16)
- BJVideoPlayer/static (1.4.16):
- BJVideoPlayer/BJYIJKMediaFramework
- Bugly (2.5.0)
- FLEX (2.4.0)
......@@ -152,11 +152,11 @@ SPEC CHECKSUMS:
BJLiveBase: 2581ad50e205da3419f1de5a8d56cee88398f401
BJLiveCore: 421a56f25a381cd7d4247b8cbd8b2768e764b773
BJLLogStat: 9a27d345ab45b663d438842b4f15a91e6e3d06e8
BJPlaybackCore: 2a1572b0b985ce71793d0ff6012017705ad9a19f
BJPlaybackCore: c55b183342bb8607e02624e42cc6887480934899
BJPlaybackUI: 799f46297c91aaba21079478ec12b4fcfec344e6
BJPlayerManagerCore: d021361160b4b18cfca6a67cc5d0f06a97e153be
BJPlayerManagerUI: dfb64d2404ed7d049ab19c9905885cc647a395a4
BJVideoPlayer: 5fa250d7b70b42c6a8cfa2bbabaef36d1d4d5926
BJPlayerManagerCore: d3008d80dd1ed181d634228046b252d1f0583a1b
BJPlayerManagerUI: aeba94a6b5f8dee889f1a42fc13f58cb8fc53a66
BJVideoPlayer: b122190327a99e961dc65a2293f66edf79af8bae
Bugly: 3ca9f255c01025582df26f9222893b383c7e4b4e
FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
IQKeyboardManager: 6194101620b73af5e67900b8f89707a99de0b804
......@@ -165,6 +165,6 @@ SPEC CHECKSUMS:
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
ReactiveObjC: 2a38ea15335de4119d8b17caf1db1484f61db902
PODFILE CHECKSUM: 1739dafa1e630ef38664a80635e47d23eb87f06e
PODFILE CHECKSUM: b1556f30142c1c664ffbacb809858c27e4b0f21f
COCOAPODS: 1.5.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment