Merge pull request #187 from betallcoffee/2.3.0

Update podspec, delete noffmpeg subspec.

Author: hzwangsiyu

Example/PLPlayerKit.xcodeproj/project.pbxproj

@@ -264,7 +264,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		8F710A7CD1AFF7A4CE7523C0 /* [CP] Embed Pods Frameworks */ = {

Example/Podfile.lock

@@ -3,10 +3,6 @@ PODS:
   - pili-ffmpeg (3.1.0)
   - pili-librtmp (1.0.5)
   - PLPlayerKit (2.3.0):
-    - HappyDNS (~> 0.3.10)
-    - pili-librtmp (~> 1.0.5)
-    - PLPlayerKit/precompiled (= 2.3.0)
-  - PLPlayerKit/precompiled (2.3.0):
     - HappyDNS (~> 0.3.10)
     - pili-ffmpeg (~> 3.1.0)
     - pili-librtmp (~> 1.0.5)
@@ -22,8 +18,8 @@ SPEC CHECKSUMS:
   HappyDNS: 06a9fed2796663fd87626dbf02552933265bf059
   pili-ffmpeg: b76de7e6b730723497d79508be8e8efdcba31a69
   pili-librtmp: 65a6e10f7c314bd1f407ba24bd074c57cba79d0c
-  PLPlayerKit: b87f0b4efabd1ddb25f2184370b696c2f975e78a
+  PLPlayerKit: 1473253ee2d7863d8a78dbb3b965161245c51ad5
 
 PODFILE CHECKSUM: d20fd3c1a75d3d4f8346b3b33f0b42e59b6ab3ab
 
-COCOAPODS: 1.0.1
+COCOAPODS: 1.1.0.rc.2

Example/Pods/Local Podspecs/PLPlayerKit.podspec.json

@@ -21,28 +21,14 @@ Pod::Spec.new do |s|
 
   s.public_header_files = "Pod/Library/include/PLPlayerKit/*.h"
   s.source_files = 'Pod/Library/include/**/*.[h|m]'
+  s.vendored_libraries   = 'Pod/Library/lib/*.a'
 
   s.dependency 'pili-librtmp', '~> 1.0.5'
   s.dependency 'HappyDNS', '~> 0.3.10'
+  s.dependency 'pili-ffmpeg', '~> 3.1.0'
   s.frameworks = ["UIKit", "Foundation", "CoreGraphics", "MediaPlayer", "CoreAudio", "AudioToolbox", "Accelerate", "QuartzCore", "OpenGLES", "AVFoundation"]
   s.libraries = "c++", "z", "bz2", "iconv"
 
-  s.default_subspec = "precompiled"
+  s.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/../ffmpeg/include ${PODS_ROOT}/pili-ffmpeg/pili-ffmpeg/include", 'LIBRARY_SEARCH_PATHS' => "${PODS_ROOT}/../ffmpeg/lib" }
 
-  s.subspec "precompiled" do |ss|
-    ss.preserve_paths         = "Pod/Library/include/PLPlayerKit/*.[h|m]", 'Pod/Library/lib/*.a'
-    ss.vendored_libraries   = 'Pod/Library/lib/*.a'
-    ss.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/#{s.name}/PLPlayerKit/lib/include" }
-    ss.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/pili-ffmpeg/pili-ffmpeg/include" }
-    ss.dependency 'pili-ffmpeg', '~> 3.1.0'
-  end
-
-  s.subspec "noffmpeg" do |ss|
-    ss.public_header_files  = "Pod/Library/include/PLPlayerKit/*.h"
-    ss.source_files         = 'Pod/Library/include/**/*.[h|m]'
-    ss.preserve_paths       = "Pod/Library/include/PLPlayerKit/*.[h|m]", 'Pod/Library/lib/*.a'
-    ss.vendored_libraries   = 'Pod/Library/lib/*.a'
-    ss.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/#{s.name}/PLPlayerKit/lib/include" }
-    ss.xcconfig = { 'HEADER_SEARCH_PATHS' => "${PODS_ROOT}/../ffmpeg/include", 'LIBRARY_SEARCH_PATHS' => "${PODS_ROOT}/../ffmpeg/lib" }
-  end
 end