feat: upgrade deps and remove appcenter

Author: Zxilly

.github/workflows/release.yml

@@ -67,7 +67,6 @@ jobs:
           files: |
             app/build/outputs/apk/github/release/*
             app/build/outputs/apk/free/release/app-free-release.apk
-            app/build/outputs/apk/appcenter/release/app-appcenter-release.apk
 
       - name: Release Package
         uses: marvinpinto/action-automatic-releases@latest
@@ -79,28 +78,8 @@ jobs:
           files: |
             app/build/outputs/apk/github/release/*
             app/build/outputs/apk/free/release/app-free-release.apk
-            app/build/outputs/apk/appcenter/release/app-appcenter-release.apk
             app/build/outputs/bundle/playRelease/app-play-release.aab
 
-      - name: Get apk info
-        id: apk-info
-        uses: hkusu/apk-info-action@v1
-        with:
-          apk-path: app/build/outputs/apk/appcenter/release/app-appcenter-release.apk
-
-      - name: Setup AppCenter CLI
-        run: |
-          npm install -g appcenter-cli
-
-      - name: Upload artifact to App Center
-        run: |
-          ./scripts/appcenter.sh
-        shell: bash
-        env:
-          VERSION_CODE: ${{ steps.apk-info.outputs.version-code }}
-          VERSION_NAME: ${{ steps.apk-info.outputs.version-name }}
-          APPCENTER_TOKEN: ${{ secrets.APP_CENTER_TOKEN }}
-
       - name: Create whatsNew
         if: steps.release.outputs.release == 'true'
         run: |

README.md

@@ -13,8 +13,6 @@
 
 ## Download
 
-[AppCenter](https://install.appcenter.ms/users/zxilly/apps/notify/distribution_groups/public)
-
 [Github Release](https://github.com/ZNotify/android/releases)
 
 <a href="https://play.google.com/store/apps/details?id=top.learningman.push"><img src="/static/google-play-badge.png" width="250"></a>
@@ -25,7 +23,6 @@
 
 `app-github-release.apk` 包含从 `Github` 下载应用内更新的代码。
 
-`AppCenter` 的应用内更新由 `AppCenter` 提供。
 
 `Google Play` 的应用内更新由 `Google Play In-app` 提供。
 

app/build.gradle.kts

@@ -1,16 +1,18 @@
 @file:Suppress("UnstableApiUsage")
 
 import dev.zxilly.gradle.exec
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.application") version "8.2.0"
+    id("com.android.application") version "8.13.1"
 
     val ktVersion = "2.1.0"
 
     kotlin("android") version ktVersion
     kotlin("plugin.serialization") version ktVersion
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.21"
 
-    id("com.google.gms.google-services") version "4.4.0"
+    id("com.google.gms.google-services") version "4.4.4"
     id("dev.zxilly.gradle.keeper") version "0.1.0"
 }
 
@@ -64,7 +66,7 @@ android {
     defaultConfig {
         applicationId = "top.learningman.push"
         minSdk = 28
-        targetSdk = 34
+        targetSdk = 36
         versionCode = currentVersionCode.toInt()
         versionName = versionBase
     }
@@ -79,7 +81,7 @@ android {
             keyPassword = password
         }
     }
-    compileSdk = 34
+    compileSdk = 36
 
     buildTypes {
         create("unsigned") {
@@ -99,15 +101,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs += listOf(
-            "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
-        )
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
     packaging {
         resources {
@@ -128,9 +129,6 @@ android {
         buildConfig = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.5-dev-k1.9.21-163bb051fe5"
-    }
     dependenciesInfo {
         includeInApk = false
         includeInBundle = false
@@ -146,10 +144,6 @@ android {
             dimension = "pub"
             versionNameSuffix = "(github)"
         }
-        create("appcenter") {
-            dimension = "pub"
-            versionNameSuffix = "(appcenter)"
-        }
         create("play") {
             dimension = "pub"
             versionNameSuffix = "(play)"
@@ -159,53 +153,53 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation("androidx.compose.material3:material3:1.1.2")
-    implementation("androidx.compose.material3:material3-window-size-class:1.1.2")
-    implementation("androidx.compose.animation:animation:1.5.4")
-    implementation("androidx.compose.ui:ui-tooling:1.5.4")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
+    implementation("androidx.core:core-ktx:1.17.0")
+    implementation("androidx.core:core-splashscreen:1.2.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+
+    implementation("androidx.activity:activity-compose:1.12.1")
+    implementation("androidx.compose.material3:material3:1.4.0")
+    implementation("androidx.compose.material3:material3-window-size-class:1.4.0")
+    implementation("androidx.compose.animation:animation:1.10.0")
+    implementation("androidx.compose.ui:ui-tooling:1.10.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0")
     implementation("com.google.android.material:compose-theme-adapter:1.2.1")
 
-    implementation("com.google.android.material:material:1.10.0")
+    implementation("com.google.android.material:material:1.13.0")
 
-    implementation(platform("com.google.firebase:firebase-bom:31.1.1"))
-    implementation("com.google.firebase:firebase-messaging-ktx")
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation(platform("com.google.firebase:firebase-bom:34.6.0"))
+    implementation("com.google.firebase:firebase-messaging")
+    implementation("androidx.core:core-ktx:1.17.0")
 
     val playImplementation by configurations
     playImplementation("com.google.android.play:app-update:2.1.0")
     playImplementation("com.google.android.play:app-update-ktx:2.1.0")
 
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.5")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.5")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.9.6")
+    implementation("androidx.navigation:navigation-ui-ktx:2.9.6")
 
-    val lifecycleVersion = "2.6.2"
+    val lifecycleVersion = "2.10.0"
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-service:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
-    implementation("androidx.activity:activity-ktx:1.8.1")
+    implementation("androidx.fragment:fragment-ktx:1.8.9")
+    implementation("androidx.activity:activity-ktx:1.12.1")
     implementation("androidx.preference:preference-ktx:1.2.1")
 
-    implementation("androidx.browser:browser:1.7.0")
+    implementation("androidx.browser:browser:1.9.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
 
     implementation("com.github.code-mc:material-icon-lib:1.1.5")
 
-    val ktorVersion = "3.0.3"
+    val ktorVersion = "3.3.3"
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-websockets:$ktorVersion")
     implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
@@ -218,16 +212,10 @@ dependencies {
     implementation("io.noties.markwon:html:${markwonVersion}")
     implementation("io.noties.markwon:image:${markwonVersion}")
 
-    val appCenterSdkVersion = "5.0.5"
-    implementation("com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}")
-    implementation("com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}")
-
     implementation("com.github.Zxilly:SetupWizardLib:master-SNAPSHOT")
     implementation("com.github.XomaDev:MIUI-autostart:master-SNAPSHOT")
 
     val githubImplementation by configurations
-    val appcenterImplementation by configurations
-    val upgraderVersion = "nightly.18f8e0e"
+    val upgraderVersion = "0.4.0"
     githubImplementation("dev.zxilly.lib:upgrader:$upgraderVersion")
-    appcenterImplementation("dev.zxilly.lib:upgrader:$upgraderVersion")
 }

app/proguard-rules.pro

@@ -15,4 +15,23 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
 -dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn pl.droidsonroids.gif.GifDrawable
+-dontwarn pl.droidsonroids.gif.GifDrawable
+
+-dontwarn io.ktor.client.network.sockets.TimeoutExceptionsCommonKt
+-dontwarn io.ktor.client.plugins.HttpRequestRetry$Configuration
+-dontwarn io.ktor.client.plugins.HttpRequestRetry$Plugin
+-dontwarn io.ktor.client.plugins.HttpRequestRetry$ShouldRetryContext
+-dontwarn io.ktor.client.plugins.HttpRequestRetry
+-dontwarn io.ktor.client.plugins.HttpTimeout$HttpTimeoutCapabilityConfiguration
+-dontwarn io.ktor.client.plugins.HttpTimeout$Plugin
+-dontwarn io.ktor.client.plugins.HttpTimeout
+-dontwarn io.ktor.client.plugins.UserAgent$Config
+-dontwarn io.ktor.client.plugins.UserAgent$Plugin
+-dontwarn io.ktor.client.plugins.UserAgent
+-dontwarn io.ktor.util.KtorDsl
+-dontwarn io.ktor.utils.io.CoroutinesKt
+-dontwarn io.ktor.utils.io.core.ByteReadPacket
+-dontwarn io.ktor.utils.io.core.Input
+-dontwarn io.ktor.client.plugins.contentnegotiation.ContentNegotiation$Config
+-dontwarn io.ktor.client.plugins.contentnegotiation.ContentNegotiation$Plugin
+-dontwarn io.ktor.client.plugins.contentnegotiation.ContentNegotiation

app/src/appcenter/kotlin/top/learningman/push/Checker.kt

@@ -3,7 +3,6 @@ package top.learningman.push
 import android.app.Application
 import android.content.Context
 import android.util.Log
-import com.microsoft.appcenter.crashes.Crashes
 import dev.zxilly.lib.upgrader.Upgrader
 import dev.zxilly.lib.upgrader.checker.GitHubRMCConfig
 import dev.zxilly.lib.upgrader.checker.GitHubReleaseMetadataChecker
@@ -25,7 +24,6 @@ internal fun checkerInit(app: Application) {
         )
     }.onFailure {
         Log.e("Upgrader", "Failed to initialize Upgrader", it)
-        Crashes.trackError(it)
     }
 }
 

app/src/github/kotlin/top/learningman/push/Checker.kt

@@ -10,7 +10,6 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.microsoft.appcenter.crashes.Crashes
 import dev.zxilly.notify.sdk.Client
 import kotlinx.coroutines.runBlocking
 import top.learningman.push.BuildConfig
@@ -51,7 +50,6 @@ class SettingsActivity : AppCompatActivity() {
                         checkUpgrade(requireActivity())
                     }.onFailure {
                         Log.e("Upgrader", "Failed to check upgrade", it)
-                        Crashes.trackError(it)
                     }
                     true
                 }

app/src/main/kotlin/top/learningman/push/activity/SettingsActivity.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text

app/src/main/kotlin/top/learningman/push/activity/SetupActivity.kt

@@ -4,9 +4,6 @@ import android.app.Application
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.google.android.material.color.DynamicColors
-import com.microsoft.appcenter.AppCenter
-import com.microsoft.appcenter.analytics.Analytics
-import com.microsoft.appcenter.crashes.Crashes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -23,23 +20,6 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        AppCenter.start(
-            this,
-            Constant.APP_CENTER_SECRET,
-            Analytics::class.java,
-            Crashes::class.java
-        )
-
-        val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
-
-        Thread.setDefaultUncaughtExceptionHandler { thr, err ->
-            Crashes.trackError(err)
-            if (oldHandler != null) oldHandler.uncaughtException(
-                thr,
-                err
-            )
-            else exitProcess(2)
-        }
 
         DynamicColors.applyToActivitiesIfAvailable(this)