From 99dcc056a9bfd053170854db8e2bfcd8044a803e Mon Sep 17 00:00:00 2001
From: TwinStar <twinstar6980@outlook.com>
Date: Sat, 23 May 2026 23:19:17 +0800
Subject: [PATCH] Migrate to AGP9 and SDK36

---
 super_native_extensions/android/build.gradle          | 2 +-
 super_native_extensions/cargokit/gradle/plugin.gradle | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/super_native_extensions/android/build.gradle b/super_native_extensions/android/build.gradle
index 45c35964..1293985f 100644
--- a/super_native_extensions/android/build.gradle
+++ b/super_native_extensions/android/build.gradle
@@ -26,7 +26,7 @@ android {
         namespace 'com.superlist.super_native_extensions'
     }
 
-    compileSdkVersion 31
+    compileSdkVersion 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/super_native_extensions/cargokit/gradle/plugin.gradle b/super_native_extensions/cargokit/gradle/plugin.gradle
index fdf94c43..6b5568f0 100644
--- a/super_native_extensions/cargokit/gradle/plugin.gradle
+++ b/super_native_extensions/cargokit/gradle/plugin.gradle
@@ -39,6 +39,9 @@ abstract class CargoKitBuildTask extends DefaultTask {
     @Input
     List<String> targetPlatforms
 
+    @Inject
+    protected abstract ExecOperations getExecOperations();
+
     @TaskAction
     def build() {
         if (project.cargokit.manifestDir == null) {
@@ -57,12 +60,12 @@ abstract class CargoKitBuildTask extends DefaultTask {
         def rootProjectDir = project.rootProject.projectDir
 
         if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
-            project.exec {
+            execOperations.exec {
                 commandLine 'chmod', '+x', path
             }
         }
 
-        project.exec {
+        execOperations.exec {
             executable path
             args "build-gradle"
             environment "CARGOKIT_ROOT_PROJECT_DIR", rootProjectDir