From 8c972dcf34a876c6d92c137997ceba43a61af7a0 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Sun, 23 Mar 2025 12:25:52 +0800
Subject: [PATCH] app: target sdk 36

---
 app/shared/src/main/AndroidManifest.xml  | 1 +
 buildSrc/src/main/java/Setup.kt          | 6 +++---
 gradle/libs.versions.toml                | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index 495cbf55c..305f18ff8 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
 
     <application
         android:allowBackup="false"
+        android:enableOnBackInvokedCallback="false"
         android:label="Magisk"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index 5ca9d15ab..a5da52e0f 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -71,8 +71,8 @@ private val Project.androidComponents
 
 fun Project.setupCommon() {
     androidBase {
-        compileSdkVersion(35)
-        buildToolsVersion = "35.0.1"
+        compileSdkVersion(36)
+        buildToolsVersion = "36.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
         ndkVersion = "29.0.13113456"
 
@@ -302,7 +302,7 @@ fun Project.setupAppCommon() {
         }
 
         defaultConfig {
-            targetSdk = 35
+            targetSdk = 36
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt")
             )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb0c8ca67..a4b08df3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.1.10"
-android = "8.9.0"
-ksp = "2.1.10-1.0.31"
+kotlin = "2.1.20"
+android = "8.9.1"
+ksp = "2.1.20-1.0.31"
 rikka = "1.3.0"
 navigation = "2.8.4"
 libsu = "6.0.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793a..37f853b1c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME