From 03d2cea093db056d56dbbea2ee13831e3dc5253a Mon Sep 17 00:00:00 2001 From: LoveSy Date: Tue, 21 Mar 2023 11:45:26 +0800 Subject: [PATCH] Use source dependencies instead of mavenLocal (#2445) --- .github/workflows/core.yml | 23 ----------------------- daemon/build.gradle.kts | 2 +- settings.gradle.kts | 19 +++++++++++++++++-- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 7faafd97..e23afc52 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -51,18 +51,6 @@ jobs: with: gradle-home-cache-cleanup: true - - name: Checkout libxposed/api - uses: actions/checkout@v3 - with: - repository: libxposed/api - path: libxposed/api - - - name: Checkout libxposed/api - uses: actions/checkout@v3 - with: - repository: libxposed/service - path: libxposed/service - - name: Set up ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -71,17 +59,6 @@ jobs: restore-keys: ${{ runner.os }} save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - - 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 diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index 8f9183fd..71a3b251 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -119,7 +119,7 @@ android.applicationVariants.all { } dependencies { - implementation(libs.libxposed.service.`interface`) + implementation(libs.libxposed.`interface`) implementation(libs.agp.apksig) implementation(libs.commons.lang3) implementation(projects.hiddenapi.bridge) diff --git a/settings.gradle.kts b/settings.gradle.kts index 00a66ecc..34ff013a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +import java.net.URI + enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { @@ -42,8 +44,12 @@ dependencyResolutionManagement { library("appcenter-crashes", "com.microsoft.appcenter", "appcenter-crashes").versionRef(appCenterVersion) library("appcenter-analytics", "com.microsoft.appcenter", "appcenter-analytics").versionRef(appCenterVersion) - library("libxposed-api", "io.github.libxposed", "api").versionRef(libxposedVersion) - library("libxposed-service-interface", "io.github.libxposed", "service-interface").versionRef(libxposedVersion) + library("libxposed-api", "io.github.libxposed", "api").version { + branch = "master" + } + library("libxposed-interface", "io.github.libxposed", "interface").version { + branch = "master" + } library("rikkax-appcompat", "dev.rikka.rikkax.appcompat:appcompat:1.6.1") @@ -91,6 +97,15 @@ dependencyResolutionManagement { } } +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") + } +} + rootProject.name = "LSPosed" include( ":app",