Add commons-lang as a subproject

Avoid using a local version of this apache module

Keep xz module to resolve confict

.gitmodules

@@ -3,7 +3,10 @@
 	url = https://github.com/JingMatrix/LSPlant.git
 [submodule "external/dobby"]
 	path = external/dobby
-	url = https://github.com/LSPosed/Dobby.git
+	url = https://github.com/JingMatrix/Dobby.git
+[submodule "external/lsplt"]
+	path = external/lsplt
+	url = https://github.com/LSPosed/LSPlt.git
 [submodule "external/fmt"]
 	path = external/fmt
 	url = https://github.com/fmtlib/fmt.git
@@ -13,3 +16,9 @@
 [submodule "patch/libs/manifest-editor"]
     path = axml/libs/manifest-editor
     url = https://github.com/WindySha/ManifestEditor.git
+[submodule "external/xz-embedded"]
+	path = external/xz-embedded
+	url = https://github.com/tukaani-project/xz-embedded
+[submodule "apache/commons-lang"]
+	path = apache/commons-lang
+	url = https://github.com/apache/commons-lang

apache/build.gradle.kts

@@ -0,0 +1,16 @@
+val androidSourceCompatibility: JavaVersion by rootProject.extra
+val androidTargetCompatibility: JavaVersion by rootProject.extra
+
+plugins {
+    id("java-library")
+}
+
+java {
+    sourceCompatibility = androidSourceCompatibility
+    targetCompatibility = androidTargetCompatibility
+    sourceSets {
+        main {
+            java.srcDirs("commons-lang/src/main/java", "local")
+        }
+    }
+}

core/build.gradle.kts

@@ -57,7 +57,7 @@ copy {
 
 dependencies {
     api(libs.libxposed.api)
-    implementation(libs.commons.lang3)
+    implementation(projects.apache)
     implementation(projects.axml)
     implementation(projects.hiddenapi.bridge)
     implementation(projects.services.daemonService)

daemon/build.gradle.kts

@@ -116,7 +116,7 @@ android.applicationVariants.all {
 dependencies {
     implementation(libs.libxposed.`interface`)
     implementation(libs.agp.apksig)
-    implementation(libs.commons.lang3)
+    implementation(projects.apache)
     implementation(projects.hiddenapi.bridge)
     implementation(projects.services.daemonService)
     implementation(projects.services.managerService)

gradle/libs.versions.toml

@@ -56,9 +56,8 @@ okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-i
 
 agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" }
 appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" }
-commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.14.0" }
-material = { module = "com.google.android.material:material", version = "1.11.0" }
-gson = { module = "com.google.code.gson:gson", version = "2.10.1" }
+material = { module = "com.google.android.material:material", version = "1.12.0" }
+gson = { module = "com.google.code.gson:gson", version = "2.11.0" }
 hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "4.3" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" }

settings.gradle.kts

@@ -26,6 +26,7 @@ dependencyResolutionManagement {
 
 rootProject.name = "LSPosed"
 include(
+    ":apache",
     ":app",
     ":axml",
     ":core",