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 `<autoPublish.android-components.dir>/gradlew`. The proper behavior is to invoke `./gradlew` because the cwd is already set properly.master
parent
1e7a10c585
commit
98cc869976
|
@ -54,7 +54,7 @@ if (localProperties != null) {
|
||||||
if (androidComponentsLocalPath != null) {
|
if (androidComponentsLocalPath != null) {
|
||||||
log("Enabling automatic publication of android-components from: $androidComponentsLocalPath")
|
log("Enabling automatic publication of android-components from: $androidComponentsLocalPath")
|
||||||
log("Determining if android-components are up-to-date...")
|
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.")
|
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.
|
// 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.
|
// One executed task means gradle didn't do any work other than executing the top-level 'compile' task.
|
||||||
|
|
Loading…
Reference in New Issue