From 268cad8fd356f078b9baa1f1746aaec00257fb57 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sun, 21 Aug 2022 22:20:47 +0800 Subject: [PATCH] Update Gradle & PlatformSDK - Update Android Sdk version to 33 - Update Gradle version to 7.5.1 - Merge legacy code --- demo-app/build.gradle | 4 ++-- demo-module/build.gradle | 4 ++-- .../yukihookapi/demo_module/ui/PreferenceActivity.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo-app/build.gradle b/demo-app/build.gradle index 5af41866..3128cf83 100644 --- a/demo-app/build.gradle +++ b/demo-app/build.gradle @@ -15,12 +15,12 @@ android { } } - compileSdk 32 + compileSdk 33 defaultConfig { applicationId "com.highcapable.yukihookapi.demo_app" minSdk 21 - targetSdk 32 + targetSdk 33 versionCode 1 versionName "1.0" diff --git a/demo-module/build.gradle b/demo-module/build.gradle index 3c6c0e5e..8ef932ac 100644 --- a/demo-module/build.gradle +++ b/demo-module/build.gradle @@ -16,12 +16,12 @@ android { } } - compileSdk 32 + compileSdk 33 defaultConfig { applicationId "com.highcapable.yukihookapi.demo_module" minSdk 21 - targetSdk 32 + targetSdk 33 versionCode 1 versionName "1.0" diff --git a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/PreferenceActivity.kt b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/PreferenceActivity.kt index 3106f8db..34f8a720 100644 --- a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/PreferenceActivity.kt +++ b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/PreferenceActivity.kt @@ -50,7 +50,7 @@ class PreferenceActivity : ModuleAppCompatActivity() { } override fun onSupportNavigateUp(): Boolean { - onBackPressed() + onBackPressedDispatcher.onBackPressed() return true } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0a0ce76a..181ea250 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Jan 29 22:55:22 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME