Merge cb32c70

naicfeng · Jun 28, 2023 · 2bf7e82 · 2bf7e82
2 parents 30eca06 + cb32c70
commit 2bf7e82
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -38,6 +38,19 @@ jobs:
             echo androidStoreFile='key.jks' >> gradle.properties
             echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
           fi
+
+      - name: Checkout libxposed/api
+        uses: actions/checkout@v3
+        with:
+          repository: libxposed/api
+          path: libxposed/api
+
+      - name: Checkout libxposed/service
+        uses: actions/checkout@v3
+        with:
+          repository: libxposed/service
+          path: libxposed/service
+
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -57,10 +70,20 @@ jobs:
           restore-keys: ${{ runner.os }}
           save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/LSPosed' }}
 
+      - name: Build dependencies
+        working-directory: libxposed
+        run: |
+          cd api
+          echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          ./gradlew :api:publishApiPublicationToMavenLocal
+          cd ..
+          cd service
+          echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          ./gradlew :interface:publishInterfacePublicationToMavenLocal
+
       - name: Build with Gradle
         run: |
           echo 'org.gradle.parallel=true' >> gradle.properties
-          echo 'org.gradle.vfs.watch=true' >> gradle.properties
           echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
           echo 'android.native.buildOutput=verbose' >> gradle.properties
           sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties

diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
@@ -20,7 +20,6 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.ide.common.signing.KeystoreHelper
 import java.io.PrintStream
-import java.util.*
 
 plugins {
     alias(libs.plugins.agp.app)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -63,3 +63,6 @@ gson = { module = "com.google.code.gson:gson", version = "2.10.1" }
 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.1" }
+
+libxposed-api = { group = "io.github.libxposed", name = "api", version.ref = "libxposed" }
+libxposed-interface = { group = "io.github.libxposed", name = "interface", version.ref = "libxposed" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,3 @@
-import java.net.URI
-
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
@@ -15,25 +13,14 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-    }
-    versionCatalogs {
-        create("libs") {
-            library("libxposed-api", "io.github.libxposed", "api").version {
-                branch = "master"
-            }
-            library("libxposed-interface", "io.github.libxposed", "interface").version {
-                branch = "master"
+        mavenLocal {
+            content {
+                includeGroup("io.github.libxposed")
             }
         }
     }
-}
-
-sourceControl {
-    gitRepository(URI.create("https://github.com/libxposed/api.git")) {
-        producesModule("io.github.libxposed:api")
-    }
-    gitRepository(URI.create("https://github.com/libxposed/service.git")) {
-        producesModule("io.github.libxposed:interface")
+    versionCatalogs {
+        create("libs")
     }
 }