Merge pull request #126 from yinwenjie/release/release1.16.0

release-v1.16.1
pili-engineering · Jan 8, 2019 · 3acdfd3 · 3acdfd3
2 parents 116e9b3 + 6e63445
commit 3acdfd3
Show file tree

Hide file tree

Showing 16 changed files with 336 additions and 126 deletions.
diff --git a/PLDroidShortVideoDemo/app/build.gradle b/PLDroidShortVideoDemo/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.qiniu.pili.droid.shortvideo.demo"
         minSdkVersion 18
         targetSdkVersion 25
-        versionCode 21
-        versionName "1.16.0"
+        versionCode 22
+        versionName "1.16.1"
         multiDexEnabled true
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
         ndk {
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     compile 'com.qiniu:qiniu-android-sdk:7.3.11'
-    compile files('libs/pldroid-shortvideo-1.16.0.jar')
+    compile files('libs/pldroid-shortvideo-1.16.1.jar')
     compile files('libs/pldroid-player-2.1.5.jar')
     compile files('libs/EasyAR.jar')
     compile files('libs/EasyAR3D.jar')

diff --git a/PLDroidShortVideoDemo/app/libs/pldroid-shortvideo-1.16.0.jar b/PLDroidShortVideoDemo/app/libs/pldroid-shortvideo-1.16.0.jar
diff --git a/PLDroidShortVideoDemo/app/libs/pldroid-shortvideo-1.16.1.jar b/PLDroidShortVideoDemo/app/libs/pldroid-shortvideo-1.16.1.jar