Refactor LSPosed integration using composite builds

.github/workflows/main.yml

@@ -34,19 +34,6 @@ jobs:
           echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
         fi
 
-    - name: Checkout libxposed/api
-      uses: actions/checkout@main
-      with:
-        repository: libxposed/api
-        path: libxposed/api
-        ref: 54582730315ba4a3d7cfaf9baf9d23c419e07006
-
-    - name: Checkout libxposed/service
-      uses: actions/checkout@main
-      with:
-        repository: libxposed/service
-        path: libxposed/service
-
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
@@ -68,20 +55,10 @@ jobs:
       shell: bash
       run: rm -rf $ANDROID_HOME/cmake
 
-    - name: Build dependencies with Gradle
-      working-directory: libxposed
-      run: |
-        cd api
-        echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
-        ./gradlew :api:publishApiPublicationToMavenLocal
-        cd ../service
-        echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
-        ./gradlew :interface:publishInterfacePublicationToMavenLocal
-
     - name: Set short commit id
       run: echo "commit=$(echo ${{ github.sha }} | cut -c-7)" > $GITHUB_ENV
 
-    - name: Build core with Gradle
+    - name: Build with Gradle
       run: |
         {
           echo 'org.gradle.parallel=true'

build.gradle.kts

@@ -240,17 +240,3 @@ subprojects {
         configureBaseExtension()
     }
 }
-
-
-project(":core") {
-    afterEvaluate {
-        if (property("android") is LibraryExtension) {
-            val android = property("android") as LibraryExtension
-            android.run {
-                buildTypes {
-                    release { proguardFiles(rootProject.file("share/lspatch-rules.pro")) }
-                }
-            }
-        }
-    }
-}

jar/build.gradle.kts

@@ -23,7 +23,9 @@ fun Jar.configure(variant: String) {
         attributes("Main-Class" to "org.lsposed.patch.LSPatch")
     }
     dependsOn(configurations.runtimeClasspath)
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    from(configurations.runtimeClasspath.map { configuration ->
+        configuration.map { if (it.isDirectory) it else zipTree(it) }
+    })
 
     into("assets") {
         from("src/main/assets")

manager/build.gradle.kts

@@ -83,7 +83,7 @@ afterEvaluate {
 
 dependencies {
     implementation(projects.patch)
-    implementation(projects.services.daemonService)
+    implementation("vector:daemon-service")
     implementation(projects.share.android)
     implementation(projects.share.java)
     implementation(platform(lspatch.androidx.compose.bom))

meta-loader/build.gradle.kts

@@ -42,7 +42,7 @@ androidComponents.onVariants { variant ->
 }
 
 dependencies {
-    compileOnly(projects.hiddenapi.stubs)
+    compileOnly("vector:stubs")
     implementation(projects.share.java)
     implementation(libs.hiddenapibypass)
 }

patch-loader/build.gradle.kts

@@ -62,10 +62,10 @@ androidComponents.onVariants { variant ->
 }
 
 dependencies {
-    compileOnly(projects.hiddenapi.stubs)
-    implementation(projects.core)
-    implementation(projects.hiddenapi.bridge)
-    implementation(projects.services.daemonService)
+    compileOnly("vector:stubs")
+    implementation("vector:core")
+    implementation("vector:bridge")
+    implementation("vector:daemon-service")
     implementation(projects.share.android)
     implementation(projects.share.java)
 

patch/build.gradle.kts

@@ -17,8 +17,8 @@ java {
 }
 
 dependencies {
-    implementation(projects.axml)
     implementation(projects.apkzlib)
+    implementation("vector:axml")
     implementation(projects.share.java)
 
     implementation(lspatch.commons.io)

settings.gradle.kts

@@ -13,11 +13,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        mavenLocal {
-            content {
-                includeGroup("io.github.libxposed")
-            }
-        }
     }
     versionCatalogs {
         create("libs") {
@@ -31,31 +26,22 @@ dependencyResolutionManagement {
 
 rootProject.name = "LSPatch"
 include(
-    ":apache",
     ":apkzlib",
-    ":axml",
-    ":core",
-    ":hiddenapi:bridge",
-    ":hiddenapi:stubs",
     ":jar",
     ":manager",
     ":meta-loader",
     ":patch",
     ":patch-loader",
-    ":services:daemon-service",
-    ":services:manager-service",
-    ":services:xposed-service:interface",
     ":share:android",
     ":share:java",
 )
 
-project(":apache").projectDir = file("core/apache")
-project(":axml").projectDir = file("core/axml")
-project(":core").projectDir = file("core/core")
-project(":hiddenapi:bridge").projectDir = file("core/hiddenapi/bridge")
-project(":hiddenapi:stubs").projectDir = file("core/hiddenapi/stubs")
-project(":services:daemon-service").projectDir = file("core/services/daemon-service")
-project(":services:manager-service").projectDir = file("core/services/manager-service")
-project(":services:xposed-service:interface").projectDir = file("core/services/xposed-service/interface")
-
-buildCache { local { removeUnusedEntriesAfterDays = 1 } }
+includeBuild("core") {
+    dependencySubstitution {
+        substitute(module("vector:axml")).using(project(":external:axml"))
+        substitute(module("vector:bridge")).using(project(":hiddenapi:bridge"))
+        substitute(module("vector:core")).using(project(":core"))
+        substitute(module("vector:daemon-service")).using(project(":services:daemon-service"))
+        substitute(module("vector:stubs")).using(project(":hiddenapi:stubs"))
+    }
+}

share/android/build.gradle.kts

@@ -12,5 +12,5 @@ android {
 }
 
 dependencies {
-    implementation(projects.services.daemonService)
+    implementation("vector:daemon-service")
 }