Refactor build tasks and update Gradle versions

Updated Gradle version references in libs.versions.toml and gradle-wrapper.properties. Refactored plugin/build.gradle.kts to improve task execution, add CI environment checks, and prevent ADB operations during CI runs. Enhanced code structure for d8 and adb task helpers.

Author: DerGoogler

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.5.1"
-gradle = "8.1.4"
+gradle = "8.11.1"
 platform = "v33773"
 webuiXPortable = "v61"
 ksp = "2.0.0-1.0.21"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Apr 20 18:32:42 CEST 2025
 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.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/build.gradle.kts

@@ -90,14 +90,30 @@ dependencies {
     ksp(libs.square.moshi.kotlin)
 }
 
-// Optional D8 build task — unchanged
+interface InjectedExecOps {
+    @get:Inject
+    val execOps: ExecOperations
+}
+
+val Task.injected get() = project.objects.newInstance<InjectedExecOps>()
+fun Task.exec(action: Action<in ExecSpec>): ExecResult = injected.execOps.exec(action)
+
 val androidHome: String? = System.getenv("ANDROID_HOME")
     ?: System.getenv("ANDROID_SDK_ROOT")
 
 val isWindows = System.getProperty("os.name").lowercase().contains("win")
+val isCI = System.getenv("CI") == "true"
 
 val d8Bin = androidHome?.let {
-    File(it, "build-tools/${android.compileSdkVersion?.replace("android-", "")}.0.0/d8" + if (isWindows) ".bat" else "").absolutePath
+    File(
+        it,
+        "build-tools/${
+            android.compileSdkVersion?.replace(
+                "android-",
+                ""
+            )
+        }.0.0/d8" + if (isWindows) ".bat" else ""
+    ).absolutePath
 }
 
 val adbBin = androidHome?.let {
@@ -111,19 +127,26 @@ val classesJar =
 val classesOutput = buildDir.resolve("classes.dex")
 val dexOutput = buildDir.resolve("wxu.dex")
 
-fun d8(vararg args: String) {
+fun Task.d8(vararg args: String) {
     if (d8Bin == null) {
         error("ANDROID_HOME or ANDROID_SDK_ROOT not set. Cannot locate d8.")
     }
+
     exec {
         commandLine(d8Bin, *args)
     }
 }
 
-fun adb(vararg args: String) {
+fun Task.adb(vararg args: String) {
+    if (isCI) {
+        print("ADB can't run in CI environment.")
+        return
+    }
+
     if (adbBin == null) {
         error("ANDROID_HOME or ANDROID_SDK_ROOT not set. Cannot locate adb.")
     }
+
     exec {
         commandLine(adbBin, *args)
     }
@@ -163,12 +186,15 @@ tasks.register("build-dex") {
 
         if (classesOutput.renameTo(dexOutput)) {
             println("DEX file created at: $dexOutput")
-            println("Pushing DEX file to device...")
-            adb(
-                "push",
-                dexOutput.absolutePath,
-                "/data/adb/modules/mmrl_wpd/webroot/plugins/wxu.dex"
-            )
+
+            if (!isCI) {
+                println("Pushing DEX file to device...")
+                adb(
+                    "push",
+                    dexOutput.absolutePath,
+                    "/data/adb/modules/mmrl_wpd/webroot/plugins/wxu.dex"
+                )
+            }
         }
 
         val latestSo = findLatestSoFile()
@@ -177,11 +203,14 @@ tasks.register("build-dex") {
             copyTo.parentFile.mkdirs()
             latestSo.copyTo(copyTo, overwrite = true)
             println("Copied .so to: $copyTo")
-            adb(
-                "push",
-                latestSo.absolutePath,
-                "/data/adb/modules/mmrl_wpd/webroot/shared/libnative.so"
-            )
+
+            if (!isCI) {
+                adb(
+                    "push",
+                    latestSo.absolutePath,
+                    "/data/adb/modules/mmrl_wpd/webroot/shared/libnative.so"
+                )
+            }
         } else {
             println("No .so file found in intermediates.")
         }