Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 18 additions & 117 deletions BeamMusicPlayerExample.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "95D169E59DFF45CC9DD1F704"
BlueprintIdentifier = "C4489A59316C42678A6858FB"
BuildableName = "libPods-OBSlider.a"
BlueprintName = "Pods-OBSlider"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand All @@ -28,7 +28,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "57A654E741BD44D58A1F51E4"
BlueprintIdentifier = "1558A557351A4DCD9D65F761"
BuildableName = "libPods.a"
BlueprintName = "Pods"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand All @@ -42,7 +42,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8A0A029AA37B4F6C81BF0F8E"
BlueprintIdentifier = "52237BFDCABB412589A0D135"
BuildableName = "libPods-BeamMusicPlayerExampleTests-OCMock.a"
BlueprintName = "Pods-BeamMusicPlayerExampleTests-OCMock"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand All @@ -56,7 +56,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B8B6842A5864DA99DB2E852"
BlueprintIdentifier = "0E34F283BFFA49B488F16549"
BuildableName = "libPods-BeamMusicPlayerExampleTests.a"
BlueprintName = "Pods-BeamMusicPlayerExampleTests"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
Expand Down
11 changes: 10 additions & 1 deletion BeamMusicPlayerExample.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions BeamMusicPlayerViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
Pod::Spec.new do |s|
s.name = 'BeamMusicPlayerViewController'
s.version = '0.2.1'
s.version = '0.2.2'
s.summary = 'An iPhone/iPad view controller to visualize and control music playback.'
s.homepage = 'https://github.com/BeamApp/MusicPlayerViewController'
s.license = {:type => 'New BSD', :file => 'LICENSE'}
s.authors = { 'Moritz Haarmann' => 'http://momo.brauchtman.net', 'Heiko Behrens' => 'http://HeikoBehrens.net' }
s.source = { :git => 'https://github.com/BeamApp/MusicPlayerViewController.git', :tag => s.version.to_s }
s.platform = :ios, '5.0'
s.source_files = 'Source/*.{h,m}'
s.exclude_files = 'Source/BeamMPMusicPlayerProvider.{h,m}'
s.exclude_files = 'Source/BeamMPMusicPlayerProvider.{h,m}', 'Source/NSDateFormatter+Duration.{h,m}'
s.resources = 'Source/*.{bundle,xib}',
s.frameworks = 'CoreGraphics'
s.requires_arc = true
s.dependency 'OBSlider', '~> 1.1'
s.dependency 'OBSlider', '~> 1.1.0'
s.dependency 'AutoScrollLabel', '~> 0.0.1'

s.preferred_dependency = 'MediaPlayer'
#s.preferred_dependency = 'MediaPlayer'
s.subspec 'MediaPlayer' do |mediaPlayer|
mediaPlayer.source_files = 'Source/BeamMPMusicPlayerProvider.{h,m}'
mediaPlayer.frameworks = 'MediaPlayer'
end
s.subspec 'Categories' do |categories|
categories.source_files = 'Source/NSDateFormatter+Duration.{h,m}'
end
end
11 changes: 8 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
platform :ios
pod 'OBSlider', '~> 1.1.0'
platform :ios, '5.0'

# For your projects use
#pod 'BeamMusicPlayerViewController'

# For BeamMusicPlayerViewController development
pod 'BeamMusicPlayerViewController', :path => './'

target :BeamMusicPlayerExampleTests, :exclusive => true do
pod 'OCMock'
end
end
26 changes: 22 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
PODS:
- AutoScrollLabel (0.0.1)
- BeamMusicPlayerViewController (0.2.2):
- AutoScrollLabel (~> 0.0.1)
- BeamMusicPlayerViewController/Categories
- BeamMusicPlayerViewController/MediaPlayer
- OBSlider (~> 1.1.0)
- BeamMusicPlayerViewController/Categories (0.2.2):
- AutoScrollLabel (~> 0.0.1)
- OBSlider (~> 1.1.0)
- BeamMusicPlayerViewController/MediaPlayer (0.2.2):
- AutoScrollLabel (~> 0.0.1)
- OBSlider (~> 1.1.0)
- OBSlider (1.1.0)
- OCMock (2.1.1)
- OCMock (2.2)

DEPENDENCIES:
- OBSlider (~> 1.1.0)
- BeamMusicPlayerViewController (from `./`)
- OCMock

EXTERNAL SOURCES:
BeamMusicPlayerViewController:
:path: ./

SPEC CHECKSUMS:
AutoScrollLabel: 10a03d16cd76a29a67449d8dfccffd4d2890e9bb
BeamMusicPlayerViewController: cad6db0ec6c8273684bdf0e3bfea55fa7c61053e
OBSlider: 1eae1ad6fea0af687f7dde0366003044c4ba3d27
OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3
OCMock: 5300ae6b75398fc3ae6cbf9102191333d35f6852

COCOAPODS: 0.21.0
COCOAPODS: 0.22.2
55 changes: 55 additions & 0 deletions Pods/AutoScrollLabel/AutoScrollLabel/AutoScrollLabel.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading