Merge branch 'master' of https://github.com/tencentyun/TIMSDK

TencentCloud · Oct 10, 2019 · 413ec82 · 413ec82
2 parents 956144d + b03c10d
commit 413ec82
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -84,6 +84,6 @@ dependencies {
     compile 'com.tencent.bugly:nativecrashreport:latest.release'
     compile 'org.bouncycastle:bcpkix-jdk15on:1.59'
 
-implementation 'com.tencent.imsdk:tuikit:4.5.45'
+implementation 'com.tencent.imsdk:tuikit:4.5.55'
 // implementation project(':tuikit')
 }
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -35,7 +35,7 @@ ext {
     minSdkVersion = 16
     targetSdkVersion = 28
     versionCode = 1
-    versionName = "4.5.45"
+    versionName = "4.5.55"
     abiFilters = ['armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'] //['armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64']
     arguments = "-DANDROID_STL=c++_static"
     cppFlags = "-std=c++11"

diff --git a/Android/tuikit/build.gradle b/Android/tuikit/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
 
-api 'com.tencent.imsdk:imsdk:4.5.45'
+api 'com.tencent.imsdk:imsdk:4.5.55'
 // api project(':imsdk')
 }