Merge branch 'private_beta'

# Conflicts:
#	OpenIM-SDK/libs/v3.3.1-rc.8-e-v1.1.3.aar
#	app/build.gradle

Author: Oliver-WJ

OpenIM-SDK/libs/v3.3.1-rc.8-e-v1.1.3.aar

@@ -220,8 +220,8 @@ public void uploadFile(OnBase<String> base, OnPutFileListener listener,
      *
      * @param fcmToken token
      */
-    public void updateFcmToken(OnBase<String> base, String fcmToken) {
-        Open_im_sdk.updateFcmToken(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), fcmToken);
+    public void updateFcmToken(OnBase<String> base, String fcmToken,long expireTime) {
+        Open_im_sdk.updateFcmToken(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), fcmToken,expireTime);
     }
 
     public void setOnListenerForService(OnListenerForService listener) {

OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java

@@ -172,13 +172,6 @@ public void deleteConversationAndDeleteAllMsg(OnBase<String> base, String conver
         Open_im_sdk.deleteConversationAndDeleteAllMsg(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), conversionID);
     }
 
-    /***
-     * 从本地删除所有会话
-     * */
-    public void deleteAllConversationFromLocal(OnBase<String> base) {
-        Open_im_sdk.deleteAllConversationFromLocal(BaseImpl.stringBase(base), ParamsUtil.buildOperationID());
-    }
-
     /**
      * 清除@消息标志位
      *

OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java

@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.openim.example"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -32,11 +32,10 @@ android {
 
 dependencies {
 //    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment:2.3.5'
     implementation 'androidx.navigation:navigation-ui:2.3.5'
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath "com.android.tools.build:gradle:7.0.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files