Merge remote-tracking branch 'origin/master'

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
 
@@ -141,7 +138,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")

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\"")
+        }
+    }

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(