Merge pull request #79 from depthlove/master

v2.2.4 release
pili-engineering · Oct 23, 2017 · 6e080d9 · 6e080d9
2 parents a79eaab + 982a39b
commit 6e080d9
Show file tree

Hide file tree

Showing 50 changed files with 388 additions and 207 deletions.
diff --git a/APIDiffs/api-diffs-2.2.4.md b/APIDiffs/api-diffs-2.2.4.md
@@ -0,0 +1,2 @@
+# PLMediaStreamingKit 2.2.3 to 2.2.4 API Differences
+
diff --git a/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj b/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj
@@ -386,7 +386,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		B651FF8E1D93D99B00D1C578 /* ShellScript */ = {

diff --git a/Example/PLMediaStreamingKitDemo/Resource/qiniu.png b/Example/PLMediaStreamingKitDemo/Resource/qiniu.png
diff --git a/Example/PLMediaStreamingKitDemo/Supporting Files/PLMediaStreamingKitDemo-Info.plist b/Example/PLMediaStreamingKitDemo/Supporting Files/PLMediaStreamingKitDemo-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.3</string>
+	<string>2.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.3</string>
+	<string>2.2.4</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -14,42 +14,42 @@ PODS:
   - BlocksKit/UIKit (2.2.5):
     - BlocksKit/Core
     - BlocksKit/DynamicDelegate
-  - Crashlytics (3.8.5):
-    - Fabric (~> 1.6.3)
-  - Fabric (1.6.12)
+  - Crashlytics (3.9.0):
+    - Fabric (~> 1.7.0)
+  - Fabric (1.7.0)
   - HappyDNS (0.3.10)
-  - Masonry (1.0.2)
+  - Masonry (1.1.0)
   - pili-librtmp (1.0.7)
-  - PLMediaStreamingKit (2.2.3):
+  - PLMediaStreamingKit (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
-    - PLMediaStreamingKit/Common (= 2.2.3)
-    - PLMediaStreamingKit/PLCameraStreamingKit (= 2.2.3)
-    - PLMediaStreamingKit/PLMediaStreamingKit (= 2.2.3)
-    - PLMediaStreamingKit/PLRTCStreamingKit (= 2.2.3)
-    - PLMediaStreamingKit/PLStreamingKit (= 2.2.3)
+    - PLMediaStreamingKit/Common (= 2.2.4)
+    - PLMediaStreamingKit/PLCameraStreamingKit (= 2.2.4)
+    - PLMediaStreamingKit/PLMediaStreamingKit (= 2.2.4)
+    - PLMediaStreamingKit/PLRTCStreamingKit (= 2.2.4)
+    - PLMediaStreamingKit/PLStreamingKit (= 2.2.4)
     - QNNetDiag (= 0.0.6)
-  - PLMediaStreamingKit/Common (2.2.3):
+  - PLMediaStreamingKit/Common (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
     - QNNetDiag (= 0.0.6)
-  - PLMediaStreamingKit/PLCameraStreamingKit (2.2.3):
+  - PLMediaStreamingKit/PLCameraStreamingKit (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
     - PLMediaStreamingKit/PLStreamingKit
     - QNNetDiag (= 0.0.6)
-  - PLMediaStreamingKit/PLMediaStreamingKit (2.2.3):
+  - PLMediaStreamingKit/PLMediaStreamingKit (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
     - PLMediaStreamingKit/PLCameraStreamingKit
     - PLMediaStreamingKit/PLRTCStreamingKit
     - QNNetDiag (= 0.0.6)
-  - PLMediaStreamingKit/PLRTCStreamingKit (2.2.3):
+  - PLMediaStreamingKit/PLRTCStreamingKit (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
     - PLMediaStreamingKit/PLStreamingKit
     - QNNetDiag (= 0.0.6)
-  - PLMediaStreamingKit/PLStreamingKit (2.2.3):
+  - PLMediaStreamingKit/PLStreamingKit (2.2.4):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.7)
     - PLMediaStreamingKit/Common
@@ -67,19 +67,19 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   PLMediaStreamingKit:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
   BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
-  Crashlytics: dfbae35ef22ca189240d230ad501feea4ee85d2d
-  Fabric: f050464eac45a2ce5a8e6e6a07e977c0df32fe28
+  Crashlytics: 64aad5dd97249dd3ff94b979fea140144590cdd3
+  Fabric: e6be012366472553807dada21243c5ab8d904151
   HappyDNS: 06a9fed2796663fd87626dbf02552933265bf059
-  Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
+  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   pili-librtmp: e8a06a45b0a1a166c48ae6dc718171c0963f32ea
-  PLMediaStreamingKit: 9da4338a1cb2159925ac9587e78b1f27b60033f2
+  PLMediaStreamingKit: 441ff22df2452d99fcebb291adbea73b90631360
   QNNetDiag: 6f7bbafa34c1b020e51d440f25044fe5ee10145d
   WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
 
 PODFILE CHECKSUM: 14de6849e20310a5c3ccffc657a1f50423c45303
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.1
diff --git a/Example/Pods/Crashlytics/iOS/Crashlytics.framework/Crashlytics b/Example/Pods/Crashlytics/iOS/Crashlytics.framework/Crashlytics
diff --git a/Example/Pods/Crashlytics/iOS/Crashlytics.framework/Info.plist b/Example/Pods/Crashlytics/iOS/Crashlytics.framework/Info.plist
diff --git a/Example/Pods/Crashlytics/iOS/Crashlytics.framework/submit b/Example/Pods/Crashlytics/iOS/Crashlytics.framework/submit
diff --git a/Example/Pods/Crashlytics/iOS/Crashlytics.framework/uploadDSYM b/Example/Pods/Crashlytics/iOS/Crashlytics.framework/uploadDSYM
diff --git a/Example/Pods/Crashlytics/submit b/Example/Pods/Crashlytics/submit
diff --git a/Example/Pods/Fabric/iOS/Fabric.framework/Fabric b/Example/Pods/Fabric/iOS/Fabric.framework/Fabric
diff --git a/Example/Pods/Fabric/iOS/Fabric.framework/Info.plist b/Example/Pods/Fabric/iOS/Fabric.framework/Info.plist
diff --git a/Example/Pods/Fabric/iOS/Fabric.framework/uploadDSYM b/Example/Pods/Fabric/iOS/Fabric.framework/uploadDSYM
diff --git a/Example/Pods/Fabric/upload-symbols b/Example/Pods/Fabric/upload-symbols
diff --git a/Example/Pods/Fabric/uploadDSYM b/Example/Pods/Fabric/uploadDSYM
diff --git a/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json b/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Masonry/Masonry/MASCompositeConstraint.m b/Example/Pods/Masonry/Masonry/MASCompositeConstraint.m
diff --git a/Example/Pods/Masonry/Masonry/MASConstraint.h b/Example/Pods/Masonry/Masonry/MASConstraint.h
diff --git a/Example/Pods/Masonry/Masonry/MASConstraint.m b/Example/Pods/Masonry/Masonry/MASConstraint.m
diff --git a/Example/Pods/Masonry/Masonry/MASConstraintMaker.h b/Example/Pods/Masonry/Masonry/MASConstraintMaker.h