Merge branch 'release/1.5.11'

SRGSSR · Nov 19, 2015 · e1c0fed · e1c0fed
2 parents d8dcd98 + a3583e1
commit e1c0fed
Show file tree

Hide file tree

Showing 7 changed files with 320 additions and 320 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -14,11 +14,11 @@ PODS:
   - SDWebImage (3.7.0):
     - SDWebImage/Core (= 3.7.0)
   - SDWebImage/Core (3.7.0)
-  - SRGMediaPlayer (1.5.10):
+  - SRGMediaPlayer (1.5.11):
     - libextobjc/EXTScope (~> 0.4.1)
-    - SRGMediaPlayer/Version (= 1.5.10)
+    - SRGMediaPlayer/Version (= 1.5.11)
     - TransitionKit (~> 2.2.0)
-  - SRGMediaPlayer/Version (1.5.10):
+  - SRGMediaPlayer/Version (1.5.11):
     - libextobjc/EXTScope (~> 0.4.1)
     - TransitionKit (~> 2.2.0)
   - TransitionKit (2.2.0)
@@ -40,7 +40,7 @@ SPEC CHECKSUMS:
   libextobjc: a650fc1bf489a3d3a9bc2e621efa3e1006fc5471
   MAKVONotificationCenter: eddfb85e77040323ee43a0fddbe616926ec005a8
   SDWebImage: b42db92951f9d565c55f1d7f1d5efe47e33a7515
-  SRGMediaPlayer: 8db282f52f919bcd862e16b4b6965175f76f4469
+  SRGMediaPlayer: c8379ab45973d6d619a52422873b04568c4eae5e
   TransitionKit: 5c9001a77acc409d71f26a4eba0159cf8619c418
 
 COCOAPODS: 0.38.2
diff --git a/Pods/Local Podspecs/SRGMediaPlayer.podspec.json b/Pods/Local Podspecs/SRGMediaPlayer.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme
diff --git a/RTSMediaPlayer/RTSMediaPlayerVersion.m b/RTSMediaPlayer/RTSMediaPlayerVersion.m
@@ -8,7 +8,7 @@
 
 NSString * const RTSMediaPlayerVersion(void)
 {
-#ifdef RTS_ANALYTICS_VERSION
+#ifdef RTS_MEDIA_PLAYER_VERSION
     return @(OS_STRINGIFY(RTS_MEDIA_PLAYER_VERSION));
 #else
     return @"dev";

diff --git a/SRGMediaPlayer.podspec b/SRGMediaPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "SRGMediaPlayer"
-  s.version               = "1.5.10"
+  s.version               = "1.5.11"
   s.summary               = "Shared media player for SRG mobile apps."
   s.homepage              = "https://github.com/SRGSSR/SRGMediaPlayer-iOS"
   s.authors               = { "Frédéric Humbert-Droz" => "fred.hd@me.com", "Cédric Luthi" => "cedric.luthi@rts.ch", "Cédric Foellmi" => "cedric@onekilopars.ec", "Samuel Défago" => "defagos@gmail.com" }