Skip to content

Commit

Permalink
Merge pull request #135 from noreasonprojects/release/1.3.3
Browse files Browse the repository at this point in the history
Release/1.3.3
  • Loading branch information
raphrel authored Nov 3, 2019
2 parents c94ae1d + a7ec58e commit fd340a7
Show file tree
Hide file tree
Showing 13 changed files with 1,160 additions and 1,149 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
All notable changes to this project will be documented in this file.

---
## [X.X.X]
## [1.3.3]
* Feature:
* Seek media with a given offset
* Seek position is bounded between 0 and current media end time
* Demo:
* New simple video example
* Breaking change:
* Remove useless ModernAVPlayerCurrentMedia protocol
* Dependencies:
* Update some gems

## [1.3.2]
* Fixes:
Expand Down
4 changes: 2 additions & 2 deletions Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.2</string>
<string>1.3.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>20191029.2253</string>
<string>20191103.1549</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
14 changes: 7 additions & 7 deletions Example/SimpleAudio.storyboard
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8pj-Db-dz9">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8pj-Db-dz9">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -22,17 +22,17 @@
<constraint firstAttribute="height" constant="120" id="xxI-QW-kVv"/>
</constraints>
</pickerView>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="jiY-A4-u4S" userLabel="Labels">
<rect key="frame" x="20" y="349" width="374" height="24"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="jiY-A4-u4S" userLabel="Labels">
<rect key="frame" x="20" y="325" width="374" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="State" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4s-cd-v6c">
<rect key="frame" x="0.0" y="0.0" width="187" height="24"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="24"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Timing" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d0L-ea-V62">
<rect key="frame" x="187" y="0.0" width="187" height="24"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Timing" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d0L-ea-V62">
<rect key="frame" x="0.0" y="24" width="374" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down
12 changes: 6 additions & 6 deletions Example/SimpleVideo.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xYF-43-zQN" userLabel="PlayerVideo" customClass="AVPlayerView" customModule="ModernAVPlayer_Example" customModuleProvider="target">
<rect key="frame" x="20" y="94" width="374" height="217"/>
<rect key="frame" x="20" y="94" width="374" height="193"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="vkQ-fX-KT2" userLabel="Labels">
<rect key="frame" x="20" y="354" width="374" height="24"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="vkQ-fX-KT2" userLabel="Labels">
<rect key="frame" x="20" y="330" width="374" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="State" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ept-HN-lio">
<rect key="frame" x="0.0" y="0.0" width="187" height="24"/>
<rect key="frame" x="0.0" y="0.0" width="374" height="24"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Timing" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJv-4v-WZz">
<rect key="frame" x="187" y="0.0" width="187" height="24"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Timing" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJv-4v-WZz">
<rect key="frame" x="0.0" y="24" width="374" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ GEM
dotenv (2.7.5)
emoji_regex (1.0.1)
escape (0.0.4)
excon (0.67.0)
excon (0.68.0)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
Expand Down Expand Up @@ -120,9 +120,9 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
google-cloud-core (1.3.2)
google-cloud-core (1.4.1)
google-cloud-env (~> 1.0)
google-cloud-env (1.2.1)
google-cloud-env (1.3.0)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
digest-crc (~> 0.4)
Expand All @@ -149,7 +149,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mini_magick (4.9.5)
minitest (5.12.2)
minitest (5.13.0)
molinillo (0.6.6)
multi_json (1.14.1)
multi_xml (0.6.0)
Expand Down
2 changes: 1 addition & 1 deletion ModernAVPlayer.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ModernAVPlayer'
s.version = '1.3.2'
s.version = '1.3.3'
s.summary = 'ModernAVPlayer is an audio persistence AVPlayer wrapper'
s.description = <<-DESC
ModernAVPlayer is an ongoing project that aims to create a more usable audio video player with readable status and network persistence option.
Expand Down
4 changes: 2 additions & 2 deletions ModernAVPlayer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20191029.2253;
CURRENT_PROJECT_VERSION = 20191103.1549;
DEVELOPMENT_TEAM = UNDCF9JXB2;
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -894,7 +894,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 20191029.2253;
CURRENT_PROJECT_VERSION = 20191103.1549;
DEVELOPMENT_TEAM = 95Y7JDW7K4;
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
6 changes: 3 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- ModernAVPlayer/Core (1.3.2)
- ModernAVPlayer/RxSwift (1.3.2):
- ModernAVPlayer/Core (1.3.3)
- ModernAVPlayer/RxSwift (1.3.3):
- ModernAVPlayer/Core
- RxCocoa (~> 5.0)
- RxSwift (~> 5.0)
Expand Down Expand Up @@ -42,7 +42,7 @@ EXTERNAL SOURCES:
:path: "."

SPEC CHECKSUMS:
ModernAVPlayer: bc5df31efaadfb99233643663daaea3eafdc2dca
ModernAVPlayer: e4f47f518b152699bd0bc11490e1af92aa857a1a
Nimble: 18d5360282923225d62b09d781f63abc1a0111fc
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
Expand Down
4 changes: 2 additions & 2 deletions Pods/Local Podspecs/ModernAVPlayer.podspec.json

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

6 changes: 3 additions & 3 deletions Pods/Manifest.lock

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

Loading

0 comments on commit fd340a7

Please sign in to comment.