From 977b24c7a85bbfcde7dfc74d5abad740a104ea13 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Thu, 13 Feb 2025 13:25:40 +0000 Subject: [PATCH] Remove hook fix, moved to #2943 --- platform/jewel/settings.gradle.kts | 74 ++++++++++++++---------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/platform/jewel/settings.gradle.kts b/platform/jewel/settings.gradle.kts index f4a4b0430baaf..b09111f43ce02 100644 --- a/platform/jewel/settings.gradle.kts +++ b/platform/jewel/settings.gradle.kts @@ -64,51 +64,45 @@ gradleEnterprise { val isWindows get() = System.getProperty("os.name").contains("win", true) +val gradleCommand: String by +lazy(LazyThreadSafetyMode.NONE) { + val gradlewFilename = + if (isWindows) { + "gradlew.bat" + } else { + "gradlew" + } + + val gradlew = File(rootProject.projectDir, gradlewFilename) + if (gradlew.exists() && gradlew.isFile && gradlew.canExecute()) { + logger.info("Using gradlew wrapper at ${gradlew.invariantSeparatorsPath}") + gradlew.invariantSeparatorsPath + } else { + "gradle" + } +} + val shebang = if (isWindows) "" else "#!/bin/sh" +/* +// This is broken on Windows, please do not enable it again until it is fixed. gitHooks { hook("pre-push") { - if (!isWindows) { - from(shebang) { - """ - |set -x - |#### Note: this hook was autogenerated. You can edit it in Jewel's settings.gradle.kts - |GRADLEW="./gradlew" - |OLD_DIR=$(pwd) - |cd "${rootDir.absolutePath}" - |if ! ${'$'}GRADLEW ktfmtCheck ; then - | ${'$'}GRADLEW ktfmtFormat - | echo 1>&2 "\nktfmt found problems; commit the result and re-push" - | cd ${'$'}OLD_DIR - | exit 1 - |fi - |cd ${'$'}OLD_DIR - | - """ - .trimMargin() - } - } else { - // TODO @jakub fix this for Windows — the following _should_ work but I can't test it -// from(shebang) { -// """ -// |:: Note: this hook was autogenerated. You can edit it in Jewel's settings.gradle.kts -// |SET GRADLEW=gradlew.bat -// | -// |SET OLD_DIR=%CD% -// |CD /D ${rootDir.absolutePath} -// |%GRADLEW% ktfmtCheck || ( -// | %GRADLEW% ktfmtFormat -// | echo "ktfmt found problems; commit the result and re-push" -// | CD /D %OLD_DIR% -// | EXIT 1 -// |) -// | -// |CD /D %OLD_DIR% -// """ -// .trimMargin() -// } + from(shebang) { + // language=Shell Script + """ + |#### Note: this hook was autogenerated. You can edit it in settings.gradle.kts + |GRADLEW=$gradleCommand + |if ! ${'$'}GRADLEW ktfmtCheck ; then + | ${'$'}GRADLEW ktfmtFormat + | echo 1>&2 "\nktfmt found problems; commit the result and re-push" + | exit 1 + |fi + | + """ + .trimMargin() } } createHooks(overwriteExisting = true) -} +}*/