Reorganize project

dklinzh · Dec 1, 2016 · a8add8e · a8add8e
1 parent 3bdb2ae
commit a8add8e
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,10 @@ language: objective-c
 # cache: cocoapods
 podfile: Example/Podfile
 before_install:
+- gem install xcpretty
 - gem install cocoapods # Since Travis is not always on latest version
-- pod install --project-directory=Example
+- pod install --project-directory=Example --verbose
 script:
-- set -o pipefail && xcodebuild test -workspace Example/DLCMobilePlayer.xcworkspace -scheme DLCMobilePlayer-Example -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=10.1' | xcpretty
+- set -o pipefail 
+- xcodebuild test -workspace Example/DLCMobilePlayer.xcworkspace -scheme DLCMobilePlayer-Example -destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=10.1' | xcpretty
 - pod lib lint
diff --git a/DLCMobilePlayer.podspec b/DLCMobilePlayer.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'DLCMobilePlayer'
-  s.version          = '0.3.5'
+  s.version          = '0.3.6'
   s.summary          = 'A framework of video player for iOS devices that based on VLCKit.'
   s.description      = <<-DESC
                        A framework of video player for iOS devices that based on VLCKit(https://github.com/dklinzh/VLCKit). Supported protocols include http, rtsp, rtmp etc.
@@ -18,12 +18,12 @@ Pod::Spec.new do |s|
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Daniel' => '[email protected]' }
-  s.source           = { :git => 'https://github.com/dklinzh/DLCMobilePlayer/blob/master/DLCMobilePlayer.zip', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/dklinzh/DLCMobilePlayer.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
   s.ios.deployment_target = '7.0'
-  s.private_header_files = 'DLCMobilePlayer/Classes/Aspects/**/*', 'DLCMobilePlayer/Classes/MSWeakTimer/**/*'
-  s.source_files = 'DLCMobilePlayer/Classes/**/*'
+  s.private_header_files = 'DLCMobilePlayer/Classes/Aspects/**/*.h', 'DLCMobilePlayer/Classes/MSWeakTimer/**/*.h'
+  s.source_files = 'DLCMobilePlayer/Classes/**/*.{h,m}'
   s.resources = 'DLCMobilePlayer/Assets/**/*.{xib,xcassets}'
 
 #s.resource_bundles = { 'DLCMobilePlayer' => ['DLCMobilePlayer/Assets/**/*'] }

diff --git a/...layer/Classes/DLCBaseVideoView+Snapshot.h → .../MobilePlayer/DLCBaseVideoView+Snapshot.h b/...layer/Classes/DLCBaseVideoView+Snapshot.h → .../MobilePlayer/DLCBaseVideoView+Snapshot.h
diff --git a/...layer/Classes/DLCBaseVideoView+Snapshot.m → .../MobilePlayer/DLCBaseVideoView+Snapshot.m b/...layer/Classes/DLCBaseVideoView+Snapshot.m → .../MobilePlayer/DLCBaseVideoView+Snapshot.m
diff --git a/DLCMobilePlayer/Classes/DLCBaseVideoView.h → ...r/Classes/MobilePlayer/DLCBaseVideoView.h b/DLCMobilePlayer/Classes/DLCBaseVideoView.h → ...r/Classes/MobilePlayer/DLCBaseVideoView.h
diff --git a/DLCMobilePlayer/Classes/DLCBaseVideoView.m → ...r/Classes/MobilePlayer/DLCBaseVideoView.m b/DLCMobilePlayer/Classes/DLCBaseVideoView.m → ...r/Classes/MobilePlayer/DLCBaseVideoView.m
diff --git a/DLCMobilePlayer/Classes/DLCLiveVideoView.h → ...r/Classes/MobilePlayer/DLCLiveVideoView.h b/DLCMobilePlayer/Classes/DLCLiveVideoView.h → ...r/Classes/MobilePlayer/DLCLiveVideoView.h
diff --git a/DLCMobilePlayer/Classes/DLCLiveVideoView.m → ...r/Classes/MobilePlayer/DLCLiveVideoView.m b/DLCMobilePlayer/Classes/DLCLiveVideoView.m → ...r/Classes/MobilePlayer/DLCLiveVideoView.m
diff --git a/DLCMobilePlayer/Classes/DLCMobilePlayer.h → ...er/Classes/MobilePlayer/DLCMobilePlayer.h b/DLCMobilePlayer/Classes/DLCMobilePlayer.h → ...er/Classes/MobilePlayer/DLCMobilePlayer.h
diff --git a/DLCMobilePlayer/Classes/DLCNetworkCenter.h → ...r/Classes/MobilePlayer/DLCNetworkCenter.h b/DLCMobilePlayer/Classes/DLCNetworkCenter.h → ...r/Classes/MobilePlayer/DLCNetworkCenter.h
diff --git a/DLCMobilePlayer/Classes/DLCNetworkCenter.m → ...r/Classes/MobilePlayer/DLCNetworkCenter.m b/DLCMobilePlayer/Classes/DLCNetworkCenter.m → ...r/Classes/MobilePlayer/DLCNetworkCenter.m
diff --git a/...ePlayer/Classes/UIDevice+DLCOrientation.h → ...es/MobilePlayer/UIDevice+DLCOrientation.h b/...ePlayer/Classes/UIDevice+DLCOrientation.h → ...es/MobilePlayer/UIDevice+DLCOrientation.h
diff --git a/...ePlayer/Classes/UIDevice+DLCOrientation.m → ...es/MobilePlayer/UIDevice+DLCOrientation.m b/...ePlayer/Classes/UIDevice+DLCOrientation.m → ...es/MobilePlayer/UIDevice+DLCOrientation.m
diff --git a/...obilePlayer/Classes/UIView+DLCAnimation.h → ...lasses/MobilePlayer/UIView+DLCAnimation.h b/...obilePlayer/Classes/UIView+DLCAnimation.h → ...lasses/MobilePlayer/UIView+DLCAnimation.h
diff --git a/...obilePlayer/Classes/UIView+DLCAnimation.m → ...lasses/MobilePlayer/UIView+DLCAnimation.m b/...obilePlayer/Classes/UIView+DLCAnimation.m → ...lasses/MobilePlayer/UIView+DLCAnimation.m
diff --git a/Example/DLCMobilePlayer/DLCMobilePlayer-Info.plist b/Example/DLCMobilePlayer/DLCMobilePlayer-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>201611251114</string>
+	<string>201612011059</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/Example/Podfile b/Example/Podfile
@@ -1,8 +1,8 @@
 use_frameworks!
 
 target 'DLCMobilePlayer_Example' do
-#  pod 'DLCMobilePlayer', :path => '../'
-    pod 'DLCMobilePlayer', :git => 'https://github.com/dklinzh/DLCMobilePlayer.git'
+   pod 'DLCMobilePlayer', :path => '../'
+#    pod 'DLCMobilePlayer', :git => 'https://github.com/dklinzh/DLCMobilePlayer.git'
 
   target 'DLCMobilePlayer_Tests' do
     inherit! :search_paths