From 0411233fc3203a5d3b924d0460b0b5721405df2f Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Fri, 28 Feb 2020 16:36:27 +1100 Subject: [PATCH] Allow builds with a local android-components to work on Windows --- settings.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 9579227e2..4cef32475 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,6 +20,10 @@ def runCmd(cmd, workingDir, successMessage) { return standardOutput } +def gradlew = './gradlew' +if (System.properties['os.name'].toLowerCase().contains('windows')) { + gradlew += ".bat" +} ////////////////////////////////////////////////////////////////////////// // Local Development overrides ////////////////////////////////////////////////////////////////////////// @@ -55,7 +59,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 = ["./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. @@ -64,7 +68,7 @@ if (localProperties != null) { log("android-components are up-to-date, skipping publication.") } else { log("android-components changed, publishing locally...") - def publishAcCmd = ["${androidComponentsLocalPath}/gradlew", "publishToMavenLocal", "-Plocal=true"] + def publishAcCmd = ["${androidComponentsLocalPath}/{gradlew}", "publishToMavenLocal", "-Plocal=true"] runCmd(publishAcCmd, androidComponentsLocalPath, "Published android-components.") } } else {