Update Gradle & Kotlin & PlatformSDK

- Update Kotlin version to 1.7.0 - Update Gradle dependencies - Merge legacy code
2025-09-01 08:45:16 +08:00 · 2022-06-10 17:39:24 +08:00
parent 62c9982e2e
commit f5bbc312e5
10 changed files with 52 additions and 53 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 plugins {
    id 'com.android.application'
    id 'org.jetbrains.kotlin.android'
-    id 'com.google.devtools.ksp' version '1.6.21-1.0.5'
+    id 'com.google.devtools.ksp' version '1.7.0-1.0.6'
 }

 android {
    namespace 'com.fankes.apperrorstracking'
-    compileSdk 31
+    compileSdk 32

    signingConfigs {
        debug {
@@ -22,8 +22,7 @@ android {
    defaultConfig {
        applicationId "com.fankes.apperrorstracking"
        minSdk 27
-        targetSdk 31
-        buildToolsVersion "31.0.0"
+        targetSdk 32
        versionCode rootProject.ext.appVersionCode
        versionName rootProject.ext.appVersionName

@@ -64,9 +63,9 @@ dependencies {
    implementation 'com.highcapable.yukihookapi:api:1.0.92'
    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.92'
    implementation "com.github.topjohnwu.libsu:core:3.1.2"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
--- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/base/BaseActivity.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/base/BaseActivity.kt
@@ -27,7 +27,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
-import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import com.fankes.apperrorstracking.R
 import com.fankes.apperrorstracking.utils.factory.isNotSystemInDarkMode
@@ -55,7 +55,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        /** 隐藏系统的标题栏 */
        supportActionBar?.hide()
        /** 初始化沉浸状态栏 */
-        ViewCompat.getWindowInsetsController(window.decorView)?.apply {
+        WindowCompat.getInsetsController(window, window.decorView).apply {
            isAppearanceLightStatusBars = isNotSystemInDarkMode
            isAppearanceLightNavigationBars = isNotSystemInDarkMode
        }
--- a/app/src/main/java/com/fankes/apperrorstracking/utils/drawable/drawabletoolbox/FlipDrawable.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/utils/drawable/drawabletoolbox/FlipDrawable.kt
@@ -19,7 +19,7 @@
 *
 * This file is Created by fankes on 2022/5/7.
 */
-@file:Suppress("DEPRECATION", "CanvasSize")
+@file:Suppress("DEPRECATION", "CanvasSize", "OVERRIDE_DEPRECATION")

 package com.fankes.apperrorstracking.utils.drawable.drawabletoolbox

--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }

 ext {
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -5,7 +5,7 @@ plugins {

 android {
    namespace 'com.fankes.apperrorsdemo'
-    compileSdk 31
+    compileSdk 32

    signingConfigs {
        debug {
@@ -20,8 +20,7 @@ android {

    defaultConfig {
        minSdk 27
-        targetSdk 31
-        buildToolsVersion '31.0.0'
+        targetSdk 32
        versionCode 1
        versionName "1.0"

@@ -68,12 +67,10 @@ android {
 }

 dependencies {
-    implementation 'com.highcapable.yukihookapi:api:1.0.87'
-    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
-    implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'com.highcapable.yukihookapi:api:1.0.92'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
--- a/demo-app/src/main/java/com/fankes/apperrorsdemo/ui/activity/base/BaseActivity.kt
+++ b/demo-app/src/main/java/com/fankes/apperrorsdemo/ui/activity/base/BaseActivity.kt
@@ -23,12 +23,14 @@

 package com.fankes.apperrorsdemo.ui.activity.base

+import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import com.fankes.apperrorsdemo.R
 import com.fankes.apperrorsdemo.utils.factory.isNotSystemInDarkMode
-import com.gyf.immersionbar.ktx.immersionBar
 import com.highcapable.yukihookapi.hook.factory.method
 import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass
 import java.lang.reflect.ParameterizedType
@@ -52,13 +54,14 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
        /** 隐藏系统的标题栏 */
        supportActionBar?.hide()
        /** 初始化沉浸状态栏 */
-        immersionBar {
-            statusBarColor(R.color.colorThemeBackground)
-            autoDarkModeEnable(true)
-            statusBarDarkFont(isNotSystemInDarkMode)
-            navigationBarColor(R.color.colorThemeBackground)
-            navigationBarDarkIcon(isNotSystemInDarkMode)
-            fitsSystemWindows(true)
+        WindowCompat.getInsetsController(window, window.decorView).apply {
+            isAppearanceLightStatusBars = isNotSystemInDarkMode
+            isAppearanceLightNavigationBars = isNotSystemInDarkMode
+        }
+        ResourcesCompat.getColor(resources, R.color.colorThemeBackground, null).also {
+            window?.statusBarColor = it
+            window?.navigationBarColor = it
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) window?.navigationBarDividerColor = it
        }
        /** 装载子类 */
        onCreate()
--- a/demo-app/src/main/res/values-night/themes.xml
+++ b/demo-app/src/main/res/values-night/themes.xml
@@ -1,16 +1,17 @@
 <resources>
    <!-- Base application theme. -->
-    <style name="Theme.AppErrorsDemo" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.AppErrorsDemo" parent="Theme.Material3.DayNight">
        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/colorPrimaryAccent</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnPrimary">@color/colorPrimaryAccent</item>
        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/colorPrimaryAccent</item>
+        <item name="colorSecondaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnSecondary">@color/colorPrimaryAccent</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:windowLightStatusBar">false</item>
        <!-- Customize your theme here. -->
    </style>
 </resources>
--- a/demo-app/src/main/res/values/colors.xml
+++ b/demo-app/src/main/res/values/colors.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#656565</color>
-    <color name="purple_500">#656565</color>
-    <color name="purple_700">#656565</color>
-    <color name="teal_200">#656565</color>
-    <color name="teal_700">#656565</color>
+    <color name="colorPrimaryAccent">#656565</color>
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>
    <color name="trans">#00000000</color>
--- a/demo-app/src/main/res/values/themes.xml
+++ b/demo-app/src/main/res/values/themes.xml
@@ -1,16 +1,17 @@
 <resources>
    <!-- Base application theme. -->
-    <style name="Theme.AppErrorsDemo" parent="Theme.MaterialComponents.DayNight">
+    <style name="Theme.AppErrorsDemo" parent="Theme.Material3.DayNight">
        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/teal_700</item>
+        <item name="colorPrimary">@color/colorPrimaryAccent</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnPrimary">@color/colorPrimaryAccent</item>
        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/colorPrimaryAccent</item>
+        <item name="colorSecondaryVariant">@color/colorPrimaryAccent</item>
+        <item name="colorOnSecondary">@color/colorPrimaryAccent</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
        <!-- Customize your theme here. -->
    </style>
 </resources>
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-XX:+UseParallelGC
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+# Incremental
+kotlin.incremental.useClasspathSnapshot=true