chore: bump gradle to 9.2.0

chore: migrate to version catalog, Gropify
misc: update project files
2026-02-04 20:27:16 +08:00 · 2025-11-12 19:05:12 +08:00 · 2025-11-12 19:05:06 +08:00 · 2025-09-27 00:59:18 +08:00 · 2025-09-27 00:59:01 +08:00 · 2025-09-23 15:59:05 +08:00
7 changed files with 27 additions and 28 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,4 @@
+# noinspection EditorConfigKeyCorrectness
 [{*.kt,*.kts}]
 ktlint_standard_annotation = disabled
 ktlint_standard_filename = disabled
@@ -24,10 +25,7 @@ ktlint_standard_function-naming = disabled
 ktlint_standard_chain-method-continuation = disabled
 ktlint_standard_class-signature = disabled
 ktlint_standard_condition-wrapping = disabled
-ktlint_standard_blank-line-between-when-conditions = disabled
-ktlint_standard_no-trailing-spaces = disabled
-ktlint_standard_multiline-loop = disabled
-ktlint_standard_when-entry-bracing = disabled
+ktlint_standard_class-signature = disabled
 ij_continuation_indent_size = 2
 indent_size = 4
 indent_style = space
--- a/demo-app/build.gradle.kts
+++ b/demo-app/build.gradle.kts
@@ -55,11 +55,7 @@ androidComponents {
    onVariants(selector().all()) {
        it.outputs.forEach { output ->
            val currentType = it.buildType
-
-            // Workaround for GitHub Actions.
-            // Strongly transfer type to [String].
-            @Suppress("UNNECESSARY_SAFE_CALL")
-            val currentSuffix = gropify.github.ci.commit.id?.let { suffix ->
+            val currentSuffix = gropify.github.ci.commit.id.let { suffix ->
                if (suffix.isNotBlank()) "-$suffix" else ""
            }
            val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})"
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.2"
+agp = "8.13.1"
 kotlin = "2.2.21"
 ksp = "2.2.21-2.0.4"
 flexi-locale = "1.0.2"
@@ -7,13 +7,12 @@ project-promote = "1.0.1"
 rovo89-xposed-api = "82"
 yukihookapi = "1.3.1"
 kavaref-core = "1.0.2"
-kavaref-extension = "1.0.2"
-betterandroid-ui-extension = "1.0.9"
+kavaref-extension = "1.0.1"
 microsoft-appcenter = "5.0.6"
 libsu = "5.2.2"
 drawabletoolbox = "1.0.7"
 gson = "2.13.2"
-okhttp = "5.3.2"
+okhttp = "5.3.0"
 androidx-core-ktx = "1.17.0"
 androidx-appcompat = "1.7.1"
 material = "1.13.0"
@@ -35,7 +34,6 @@ yukihookapi = { group = "com.highcapable.yukihookapi", name = "api", version.ref
 yukihookapi-ksp-xposed = { group = "com.highcapable.yukihookapi", name = "ksp-xposed", version.ref = "yukihookapi" }
 kavaref-core = { group = "com.highcapable.kavaref", name = "kavaref-core", version.ref = "kavaref-core" }
 kavaref-extension = { group = "com.highcapable.kavaref", name = "kavaref-extension", version.ref = "kavaref-extension" }
-betterandroid-ui-extension = { group = "com.highcapable.betterandroid", name = "ui-extension", version.ref = "betterandroid-ui-extension" }
 microsoft-appcenter-analytics = { group = "com.microsoft.appcenter", name = "appcenter-analytics", version.ref = "microsoft-appcenter" }
 microsoft-appcenter-crashes = { group = "com.microsoft.appcenter", name = "appcenter-crashes", version.ref = "microsoft-appcenter" }
 libsu = { group = "com.github.topjohnwu.libsu", name = "core", version.ref = "libsu" }
--- a/module-app/build.gradle.kts
+++ b/module-app/build.gradle.kts
@@ -51,11 +51,7 @@ androidComponents {
    onVariants(selector().all()) {
        it.outputs.forEach { output ->
            val currentType = it.buildType
-
-            // Workaround for GitHub Actions.
-            // Strongly transfer type to [String].
-            @Suppress("UNNECESSARY_SAFE_CALL")
-            val currentSuffix = gropify.github.ci.commit.id?.let { suffix ->
+            val currentSuffix = gropify.github.ci.commit.id.let { suffix ->
                if (suffix.isNotBlank()) "-$suffix" else ""
            }
            val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})"
@@ -71,7 +67,6 @@ dependencies {
    ksp(libs.yukihookapi.ksp.xposed)
    implementation(libs.kavaref.core)
    implementation(libs.kavaref.extension)
-    implementation(libs.betterandroid.ui.extension)
    implementation(libs.project.promote)
    implementation(libs.microsoft.appcenter.analytics)
    implementation(libs.microsoft.appcenter.crashes)
--- a/module-app/src/main/java/com/fankes/apperrorstracking/ui/activity/main/MainActivity.kt
+++ b/module-app/src/main/java/com/fankes/apperrorstracking/ui/activity/main/MainActivity.kt
@@ -47,7 +47,6 @@ import com.fankes.apperrorstracking.utils.tool.AppAnalyticsTool.bindAppAnalytics
 import com.fankes.apperrorstracking.utils.tool.FrameworkTool
 import com.fankes.apperrorstracking.utils.tool.GithubReleaseTool
 import com.fankes.projectpromote.ProjectPromote
-import com.highcapable.betterandroid.ui.extension.view.isUnderline
 import com.highcapable.yukihookapi.YukiHookAPI

 class MainActivity : BaseActivity<ActivityMainBinding>() {
@@ -131,7 +130,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        binding.titleGithubIcon.setOnClickListener { openBrowser(url = "https://github.com/KitsunePie/AppErrorsTracking") }
        /** 恰饭！ */
        binding.paymentFollowingZhCnItem.isVisible = isSystemLanguageSimplifiedChinese
-        binding.linkWithFollowMe.isUnderline = true
        binding.linkWithFollowMe.setOnClickListener {
            openBrowser(url = "https://www.coolapk.com/u/876977", packageName = "com.coolapk.market")
        }
--- a/module-app/src/main/res/layout/activity_main.xml
+++ b/module-app/src/main/res/layout/activity_main.xml
@@ -718,10 +718,24 @@
                    android:layout_marginBottom="10dp"
                    android:gravity="center"
                    android:lineSpacingExtra="6dp"
-                    android:text="点击这里前往酷安关注我，获取我的更多应用"
+                    android:text="恰饭时间\n点击前往酷安关注我，获取我的更多应用"
                    android:textColor="@color/colorTextGray"
                    android:textSize="16sp" />

+                <androidx.cardview.widget.CardView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    app:cardCornerRadius="15dp"
+                    app:cardElevation="0dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:adjustViewBounds="true"
+                        android:src="@mipmap/bg_payment_code" />
+                </androidx.cardview.widget.CardView>
+
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
    }
 }
 plugins {
-    id("com.highcapable.gropify") version "1.0.1"
+    id("com.highcapable.gropify") version "1.0.0"
 }
 gropify {
    global {
@@ -26,8 +26,8 @@ gropify {
                "APP_CENTER_SECRET" to ""
            )
            includeKeys(
-                "GITHUB_CI_COMMIT_ID",
-                "APP_CENTER_SECRET",
+                "GITHUB_CI_COMMIT_ID" to "",
+                "APP_CENTER_SECRET" to "",
                "^project\\..*\$".toRegex()
            )
            locations(GropifyLocation.RootProject, GropifyLocation.SystemEnv)
@@ -35,8 +35,8 @@ gropify {
        android {
            existsPropertyFiles(".secret/secret.properties")
            includeKeys("GITHUB_CI_COMMIT_ID", "APP_CENTER_SECRET")
-            // 手动指定类型，防止一些特殊 "COMMIT ID" 被生成为数值
-            keyValuesRules("GITHUB_CI_COMMIT_ID" to ValueRule(String::class))
+            // 关闭类型自动转换功能，防止一些特殊 "COMMIT ID" 被生成为数值
+            useTypeAutoConversion = false
        }
    }
    rootProject { common { isEnabled = false } }