Browse Source

Merge branch '1.2.2(20)' into develop

# Conflicts:
#	app/dependencies/releaseRuntimeClasspath.txt
#	gradle/libs.versions.toml
DoggyZhang 1 month ago
parent
commit
d5341817b1
3 changed files with 5 additions and 5 deletions
  1. 2 2
      app/dependencies/releaseRuntimeClasspath.txt
  2. 2 2
      gradle.properties
  3. 1 1
      gradle/libs.versions.toml

+ 2 - 2
app/dependencies/releaseRuntimeClasspath.txt

@@ -233,7 +233,7 @@ com.wenext.android:frame-aab:6.0.3
 com.wenext.android:frame-apm:6.0.1
 com.wenext.android:frame-audio:6.0.0
 com.wenext.android:frame-base:6.0.4
-com.wenext.android:frame-bom:6.2.14
+com.wenext.android:frame-bom:6.2.16
 com.wenext.android:frame-coroutine:6.0.0
 com.wenext.android:frame-crash:6.0.1
 com.wenext.android:frame-data:6.0.0
@@ -259,7 +259,7 @@ com.wenext.android:frame-share:6.0.3
 com.wenext.android:frame-sound:6.0.4
 com.wenext.android:frame-spi:6.0.0
 com.wenext.android:frame-startup:6.0.2
-com.wenext.android:frame-statistics:6.1.2
+com.wenext.android:frame-statistics:6.1.4
 com.wenext.android:frame-storage:6.0.7
 com.wenext.android:frame-util:6.0.10
 com.wenext.android:frame-zero:6.0.0

+ 2 - 2
gradle.properties

@@ -29,8 +29,8 @@ OFFICIAL=false
 
 IS_RELEASE=true
 
-VERSION_CODE=19
-VERSION_NAME=1.2.1
+VERSION_CODE=20
+VERSION_NAME=1.2.2
 
 OFFICIAL_UID=9998
 OFFICIAL_CONVERSATION_ID=c2c_9998

+ 1 - 1
gradle/libs.versions.toml

@@ -166,7 +166,7 @@ appleAppauth = "0.11.1"
 tiktok = "2.3.0"
 
 # frame
-frameBom = "6.2.14"
+frameBom = "6.2.16"
 
 framePush = "6.0.1"