From 4b75c8af7996bcbd8b52078309ad9dc29da01bed Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 28 Jun 2023 12:24:46 +0800 Subject: [PATCH] Revert "Use source dependencies instead of mavenLocal (#2445)" (#2586) This reverts commit 03d2cea093db056d56dbbea2ee13831e3dc5253a --- .github/workflows/core.yml | 23 +++++++++++++++++++++++ daemon/build.gradle.kts | 1 - gradle/libs.versions.toml | 3 +++ settings.gradle.kts | 23 +++++------------------ 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index c7176b8d..c6756eec 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -40,6 +40,18 @@ jobs: 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: @@ -59,6 +71,17 @@ 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 2c56efa4..6541f881 100644 --- 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 index 3a2f7a2c..af9e4118 100644 --- 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 index 18ff316d..67567072 100644 --- 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") } }