From 3e3127adcf7f9bf15d1f7e5918db52798041c2ab Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 10 Jun 2022 17:25:08 +0800 Subject: [PATCH] Update Gradle & Kotlin & PlatformSDK - Update Kotlin version to 1.7.0 - Update Gradle dependencies - Merge legacy code --- app/build.gradle | 14 +++++++------- .../notify/ui/activity/base/BaseActivity.kt | 4 ++-- .../utils/drawable/drawabletoolbox/FlipDrawable.kt | 2 +- .../coloros/notify/utils/tool/GithubReleaseTool.kt | 2 +- .../notify/utils/tool/IconRuleManagerTool.kt | 2 +- build.gradle | 6 +++--- gradle.properties | 6 ++++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 831c7ff..886d182 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ 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 { - compileSdk 31 + compileSdk 32 signingConfigs { debug { @@ -21,7 +21,7 @@ android { defaultConfig { applicationId "com.fankes.coloros.notify" minSdk 29 - targetSdk 31 + targetSdk 32 versionCode rootProject.ext.appVersionCode versionName rootProject.ext.appVersionName @@ -63,10 +63,10 @@ dependencies { ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.92' implementation "com.github.topjohnwu.libsu:core:3.1.2" implementation 'androidx.annotation:annotation:1.3.0' - implementation 'com.squareup.okhttp3:okhttp:4.9.3' - 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.squareup.okhttp3:okhttp:5.0.0-alpha.7' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt index 87dd769..9c0a2ec 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt @@ -27,7 +27,7 @@ package com.fankes.coloros.notify.ui.activity.base 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.coloros.notify.R import com.fankes.coloros.notify.utils.factory.isNotSystemInDarkMode @@ -61,7 +61,7 @@ abstract class BaseActivity : AppCompatActivity() { /** 隐藏系统的标题栏 */ supportActionBar?.hide() /** 初始化沉浸状态栏 */ - ViewCompat.getWindowInsetsController(window.decorView)?.apply { + WindowCompat.getInsetsController(window, window.decorView).apply { isAppearanceLightStatusBars = isNotSystemInDarkMode isAppearanceLightNavigationBars = isNotSystemInDarkMode } diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/drawable/drawabletoolbox/FlipDrawable.kt b/app/src/main/java/com/fankes/coloros/notify/utils/drawable/drawabletoolbox/FlipDrawable.kt index 6ed6b94..39ab91a 100755 --- a/app/src/main/java/com/fankes/coloros/notify/utils/drawable/drawabletoolbox/FlipDrawable.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/drawable/drawabletoolbox/FlipDrawable.kt @@ -20,7 +20,7 @@ * * This file is Created by fankes on 2022/1/8. */ -@file:Suppress("DEPRECATION", "CanvasSize") +@file:Suppress("DEPRECATION", "CanvasSize", "OVERRIDE_DEPRECATION") package com.fankes.coloros.notify.utils.drawable.drawabletoolbox diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt index 4c2a0d2..8b83e38 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt @@ -61,7 +61,7 @@ object GithubReleaseTool { override fun onFailure(call: Call, e: IOException) {} override fun onResponse(call: Call, response: Response) = runInSafe { - JSONObject(response.body?.string() ?: "").apply { + JSONObject(response.body.string()).apply { GithubReleaseBean( name = getString("name"), htmlUrl = getString("html_url"), diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt index 8f1a758..39efe0a 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt @@ -343,7 +343,7 @@ object IconRuleManagerTool { } override fun onResponse(call: Call, response: Response) { - val bodyString = response.body?.string() ?: "" + val bodyString = response.body.string() (context as? Activity?)?.runOnUiThread { result(true, bodyString) } ?: result(true, bodyString) } }) diff --git a/build.gradle b/build.gradle index 6eb4cf8..8cd3214 100644 --- 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 { diff --git a/gradle.properties b/gradle.properties index cd0519b..453b5ca 100644 --- 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 \ No newline at end of file +android.nonTransitiveRClass=true +# Incremental +kotlin.incremental.useClasspathSnapshot=true \ No newline at end of file