diff --git a/app/build.gradle b/app/build.gradle index e1ca203072..da67a298f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'kotlin-android' // kotlin apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -// apkChannelPackage -apply plugin: 'channel' import groovy.xml.XmlUtil @@ -204,23 +202,6 @@ android { } } -// apkChannelPackage -channel { - //多渠道包的输出目录,默认为new File(project.buildDir,"channel") - baseOutputDir = new File(project.buildDir, "channel") - //多渠道包的命名规则,默认为:${appName}-${versionName}-${versionCode}-${flavorName}-${buildType} - apkNameFormat = '${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}' -} - -rebuildChannel { -// baseDebugApk = 已有Debug APK -// baseReleaseApk = 已有Release APK -// //默认为new File(project.buildDir, "rebuildChannel/debug") -// debugOutputDir = Debug渠道包输出目录 -// //默认为new File(project.buildDir, "rebuildChannel/release") -// releaseOutputDir = Release渠道包输出目录 -} - repositories { flatDir { dirs 'libs', 'libs/aars' @@ -241,8 +222,8 @@ dependencies { debugImplementation "com.gu.android:toolargetool:${toolargetool}" debugImplementation "com.github.nichbar:WhatTheStack:$whatTheStack" - implementation "androidx.core:core:${core}" - implementation "androidx.fragment:fragment:${fragment}" + implementation "androidx.core:core-ktx:${core}" + implementation "androidx.fragment:fragment-ktx:${fragment}" implementation "androidx.multidex:multidex:${multiDex}" implementation "androidx.appcompat:appcompat:${appCompat}" implementation "androidx.cardview:cardview:${cardView}" diff --git a/app/src/main/java/com/gh/base/AppUncaughtHandler.java b/app/src/main/java/com/gh/base/AppUncaughtHandler.java index 16dc54f472..b1736e5df6 100644 --- a/app/src/main/java/com/gh/base/AppUncaughtHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaughtHandler.java @@ -26,7 +26,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import io.sentry.core.Sentry; +import io.sentry.Sentry; public class AppUncaughtHandler implements UncaughtExceptionHandler { diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 93c1609953..7bd807d513 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -19,9 +19,8 @@ import com.lightgame.utils.Utils; import java.util.HashMap; import java.util.Map; +import io.sentry.Sentry; import io.sentry.android.core.SentryAndroid; -import io.sentry.core.Sentry; -import io.sentry.core.protocol.User; /** * Created by LGT on 2016/6/15. diff --git a/app/src/main/java/com/gh/common/util/SentryHelper.kt b/app/src/main/java/com/gh/common/util/SentryHelper.kt index 7a7b4a728b..c04a2edf23 100644 --- a/app/src/main/java/com/gh/common/util/SentryHelper.kt +++ b/app/src/main/java/com/gh/common/util/SentryHelper.kt @@ -2,10 +2,10 @@ package com.gh.common.util import android.text.TextUtils import com.lightgame.utils.Utils -import io.sentry.core.Sentry -import io.sentry.core.SentryEvent -import io.sentry.core.SentryLevel -import io.sentry.core.protocol.Message +import io.sentry.Sentry +import io.sentry.SentryEvent +import io.sentry.SentryLevel +import io.sentry.protocol.Message object SentryHelper { @@ -17,7 +17,7 @@ object SentryHelper { val message = Message() message.message = eventId sentryEvent.message = message - sentryEvent.level = SentryLevel.LOG + sentryEvent.level = SentryLevel.INFO for (i in kv.indices) { if (i % 2 != 0) { diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt index 797df214ca..0e063b813a 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -26,7 +26,6 @@ import com.lightgame.download.DownloadStatus import com.lightgame.download.FileUtils import com.lightgame.utils.AppManager import com.lightgame.utils.Utils -import io.sentry.core.protocol.App class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : BaseRecyclerViewHolder(binding.root) { diff --git a/dependencies.gradle b/dependencies.gradle index db84b34983..91ba8b3320 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,24 +7,24 @@ ext { targetSdkVersion = 26 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 270 - versionName = "4.6.0" + versionCode = 290 + versionName = "4.7.0" applicationId = "com.gh.gamecenter" // AndroidX - core = "1.2.0" + core = "1.3.2" multiDex = "2.0.1" - appCompat = "1.2.0-alpha02" + appCompat = "1.2.0" cardView = "1.0.0" - fragment = "1.2.2" + fragment = "1.2.5" annotation = "1.1.0" percentLayout = "1.0.0" - constraintLayout = "1.1.3" + constraintLayout = "2.0.4" databinding = "3.4.1" recyclerView = "1.1.0" lifeCycle = "2.2.0" - room = "2.2.4" - workManager = "1.0.1" + room = "2.2.6" + workManager = "2.4.0" viewpager2 = "1.0.0" ktx = "1.2.0" localbroadcastmanager = "1.0.0" @@ -39,8 +39,8 @@ ext { // rxJava & rxAndroid rxBinding = "0.3.0" - rxJava2 = "2.1.8" - rxAndroid2 = "2.0.2" + rxJava2 = "2.2.19" + rxAndroid2 = "2.1.1" rxBinding2 = "2.1.1" retrofit = "2.3.0" okHttp = "3.12.12" @@ -107,5 +107,5 @@ ext { zip4j = "2.6.1" whatTheStack = "0.1.0_rt" - sentry = "2.3.2" // 不要更新到 3.X,3.X 需要后台版本支持 + sentry = "3.2.0" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ccb7fdf92b..3517e25d99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,7 +46,7 @@ DOUYIN_CLIENTKEY=aw66h51ftb71dkhi DOUYIN_CLIENTSECRET=155dee6c1de9ae31bffcbf32475dc161 # hosts -DEV_API_HOST=https\://dev-and-api.ghzs.com/v4d6d0/ +DEV_API_HOST=https\://dev-and-api.ghzs.com/v4d7d0/ API_HOST=https\://and-api.ghzs.com/v4d6d0/ SENSITIVE_API_HOST=https\://and-api.ghzs.com/v4d6d0/