From 98cc8699764e148285ab560b1e3e47f65a936dff Mon Sep 17 00:00:00 2001 From: Will Hawkins Date: Thu, 26 Dec 2019 13:32:57 -0500 Subject: [PATCH] Fix Issue #7366: Reference local android-components gradlew correctly In `settings.gradle` when Fenix determines whether there is an overriding local android-components it calls `gradlew` from the `autoPublish.android-components.dir` directory. It sets the current working directory (cwd) to `autoPublish.android-components.dir` and then invokes `/gradlew`. The proper behavior is to invoke `./gradlew` because the cwd is already set properly. --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 81abe7c1d..d2fc7cf20 100644 --- a/settings.gradle +++ b/settings.gradle @@ -54,7 +54,7 @@ if (localProperties != null) { if (androidComponentsLocalPath != null) { log("Enabling automatic publication of android-components from: $androidComponentsLocalPath") log("Determining if android-components are up-to-date...") - def compileAcCmd = ["${androidComponentsLocalPath}/gradlew", "compileReleaseKotlin"] + def compileAcCmd = ["./gradlew", "compileReleaseKotlin"] def compileOutput = runCmd(compileAcCmd, androidComponentsLocalPath, "Compiled android-components.") // This is somewhat brittle: parse last line of gradle output, to fish out how many tasks were executed. // One executed task means gradle didn't do any work other than executing the top-level 'compile' task.