Skip to content

Commit

Permalink
Merge pull request #18 from depthlove/master
Browse files Browse the repository at this point in the history
release v1.4.1
  • Loading branch information
lawder authored Sep 19, 2017
2 parents 79d989e + 6b83556 commit f200ce6
Show file tree
Hide file tree
Showing 25 changed files with 1,313 additions and 941 deletions.
26 changes: 26 additions & 0 deletions APIDiffs/api-diffs-1.4.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# PLShortVideoKit 1.4.0 to 1.4.1 API Differences

## General Headers

```
PLSEditPlayer.h
```

| | Description |
| ---- | ------------------------------------------------------------------------- |
| From | ```@property (assign, nonatomic) UIView *__nullable preview;``` |
| To | ```@property (strong, nonatomic) UIView *__nullable preview;``` |














2 changes: 1 addition & 1 deletion Example/PLShortVideoKitDemo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.0</string>
<string>1.4.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>Fabric</key>
Expand Down
1 change: 0 additions & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ target 'PLShortVideoKitDemo' do
pod 'Fabric', '1.6.11'
pod 'Crashlytics', '3.8.4'
pod 'Masonry', '1.0.2'
pod 'Qiniu', '7.1.5'
pod 'PLPlayerKit'
end
25 changes: 12 additions & 13 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ PODS:
- Masonry (1.0.2)
- PLPlayerKit (3.0.1):
- HappyDNS (~> 0.3.10)
- PLShortVideoKit (1.4.0):
- PLShortVideoKit/ex-libMuseProcessor (= 1.4.0)
- PLShortVideoKit/libMuseProcessor (= 1.4.0)
- Qiniu (= 7.1.5)
- PLShortVideoKit/ex-libMuseProcessor (1.4.0):
- Qiniu (= 7.1.5)
- PLShortVideoKit/libMuseProcessor (1.4.0):
- Qiniu (= 7.1.5)
- Qiniu (7.1.5):
- PLShortVideoKit (1.4.1):
- PLShortVideoKit/ex-libMuseProcessor (= 1.4.1)
- PLShortVideoKit/libMuseProcessor (= 1.4.1)
- Qiniu (= 7.1.7)
- PLShortVideoKit/ex-libMuseProcessor (1.4.1):
- Qiniu (= 7.1.7)
- PLShortVideoKit/libMuseProcessor (1.4.1):
- Qiniu (= 7.1.7)
- Qiniu (7.1.7):
- AFNetworking (~> 3)
- HappyDNS (~> 0.3)

Expand All @@ -39,7 +39,6 @@ DEPENDENCIES:
- Masonry (= 1.0.2)
- PLPlayerKit
- PLShortVideoKit (from `../`)
- Qiniu (= 7.1.5)

EXTERNAL SOURCES:
PLShortVideoKit:
Expand All @@ -52,9 +51,9 @@ SPEC CHECKSUMS:
HappyDNS: 691a3041128055d09866f86e6e9ca90f24da1f18
Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
PLPlayerKit: 18497c84e9453dcc26244ae346ca6eaed3ae2a90
PLShortVideoKit: d78772360ca0fd307aef4427cf76fb6cd936075a
Qiniu: 77a3dba411556a383d72d17e842345a9d4c83252
PLShortVideoKit: efa2035c374a99ea112342427afff4b63881e6ca
Qiniu: 56ea8b9d785326e45e3a6fdd45bdbc84f78d0eff

PODFILE CHECKSUM: 69a2b7057135313b8813515f158fa019409471e4
PODFILE CHECKSUM: d476191384c2ab8ab25ce48711e3cc47a594e9ae

COCOAPODS: 1.2.1
1 change: 1 addition & 0 deletions Example/Pods/Headers/Private/Qiniu/QNPipeline.h

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

1 change: 1 addition & 0 deletions Example/Pods/Headers/Public/Qiniu/QNPipeline.h

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

6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/PLShortVideoKit.podspec.json

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

25 changes: 12 additions & 13 deletions Example/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 f200ce6

Please sign in to comment.