Skip to content

Commit 7aa474b

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents fe8fc92 + d10ab42 commit 7aa474b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ properties.load( inputStream )
2020

2121
android {
2222
namespace = "com.hyphenate.chatdemo"
23-
compileSdk = 34
23+
compileSdk = 35
2424

2525
defaultConfig {
2626
applicationId = "com.hyphenate.chatdemo"
2727
minSdk = 21
28-
targetSdk = 34
29-
versionCode = 133
30-
versionName = "4.10.0"
28+
targetSdk = 35
29+
versionCode = 134
30+
versionName = "4.10.1"
3131

3232
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3333

@@ -213,6 +213,6 @@ dependencies {
213213
implementation("io.hyphenate:ease-call-kit:4.10.0")
214214
// implementation(project(mapOf("path" to ":ease-call-kit")))
215215

216-
implementation("io.hyphenate:hyphenate-chat:4.10.0")
216+
implementation("io.hyphenate:hyphenate-chat:4.10.1")
217217
// implementation(project(mapOf("path" to ":hyphenatechatsdk")))
218218
}

app/jni/Application.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ APP_ABI := arm64-v8a,armeabi-v7a, x86, x86_64
44
APP_STL := c++_static
55
LOCAL_MULTILIB := 32
66
APP_PLATFORM:=android-21
7+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

0 commit comments

Comments
 (0)