升级版本至 4.5.4

Merge branch 'hotfix-v4.5.3-253-multidex' into 'release'
处理分 dex 问题 See merge request halo/assistant-android!54
2020-12-26 19:08:25 +08:00 · 2020-12-26 19:05:58 +08:00 · 2020-12-26 19:01:04 +08:00
2 changed files with 4 additions and 3 deletions
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@ -11,6 +11,7 @@ import android.text.TextUtils;

 import androidx.collection.ArrayMap;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.multidex.MultiDexApplication;

 import com.gh.base.GHActivityLifecycleCallbacksImpl;
 import com.gh.common.AppExecutor;
@ -55,7 +56,7 @@ import io.reactivex.plugins.RxJavaPlugins;
 import tv.danmaku.ijk.media.exo2.Exo2PlayerManager;
 import tv.danmaku.ijk.media.exo2.ExoPlayerCacheManager;

-public class HaloApp extends Application {
+public class HaloApp extends MultiDexApplication {

    private static HaloApp mInstance;
    private static ArrayMap<String, Object> sObjectMap = new ArrayMap<>();
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,8 +7,8 @@ ext {
    targetSdkVersion = 26

    // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 253
-    versionName = "4.5.3"
+    versionCode = 254
+    versionName = "4.5.4"
    applicationId = "com.gh.gamecenter"

    // AndroidX
Author	SHA1	Message	Date
juntao	cff82379f5	升级版本至 4.5.4	2020-12-26 19:08:25 +08:00
juntao	825503bd58	Merge branch 'hotfix-v4.5.3-253-multidex' into 'release' 处理分 dex 问题 See merge request halo/assistant-android!54	2020-12-26 19:05:58 +08:00
juntao	77a715a4bd	处理分 dex 问题	2020-12-26 19:01:04 +08:00