6.6.4 - Fix - 修复 RootShell 依赖项无法获取的问题

SuperMonster003 · SuperMonster003 · commit fa4790c521db · 2025-07-28T19:47:10.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ sync.ffs_db
 
 /build/
 /libs/**/build/
+/modules/**/build/
 /captures/
 /release/
 /releases/
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,10 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.Properties
-import java.util.TimeZone
+import java.util.*
 import java.util.zip.CRC32
 import kotlin.text.RegexOption.IGNORE_CASE
 
@@ -133,7 +130,8 @@ dependencies /* Unclassified */ {
     implementation("androidx.preference:preference-ktx:1.2.1")
 
     // RootShell
-    implementation("com.github.Stericson:RootShell:1.6")
+    // implementation("com.github.Stericson:RootShell:1.6")
+    implementation(project(":libs:root-shell-1.6"))
 
     // JDeferred
     implementation("org.jdeferred:jdeferred-android-aar:1.2.6")
diff --git a/libs/root-shell-1.6/build.gradle.kts b/libs/root-shell-1.6/build.gradle.kts
@@ -0,0 +1,9 @@
+"root-shell-1.6.aar"
+    .let { path ->
+        rootProject.extra["configurationName"].toString().let { name ->
+            configurations.maybeCreate(name)
+            file(path).takeIf { it.exists() }?.also {
+                artifacts.add(name, it)
+            } ?: throw Exception("File not found: \"$path\"")
+        }
+    }
diff --git a/libs/root-shell-1.6/root-shell-1.6.aar b/libs/root-shell-1.6/root-shell-1.6.aar
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,6 +29,8 @@ private val libs = listOf(
 
     "markwon-core-4.6.2",
     "markwon-syntax-highlight-4.6.2",
+
+    "root-shell-1.6",
 )
 
 include(

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ private val libs = listOf(`
`29`	`29`
`30`	`30`	`"markwon-core-4.6.2",`
`31`	`31`	`"markwon-syntax-highlight-4.6.2",`
	`32`	`+`
	`33`	`+ "root-shell-1.6",`
`32`	`34`	`)`
`33`	`35`
`34`	`36`	`include(`