From 3035aacc85b694c1d716c44efb7583648997bfaa Mon Sep 17 00:00:00 2001 From: Jorge Lopez <49923512+jorg3lopez@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:01:20 -0700 Subject: [PATCH] Support for windows users (#15475) * unsigned commits into a single signed one, force push * Update call to get kotlin version --------- Co-authored-by: Joel Biskie Co-authored-by: Joel Biskie <84460447+jbiskie@users.noreply.github.com> --- .gitattributes | 33 ++++++++++--------- buildSrc/build.gradle.kts | 2 +- prime-router/build.gradle.kts | 15 +++++++-- .../kotlin/cli/ValidateYMLCommandTests.kt | 3 +- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.gitattributes b/.gitattributes index f7fbf78a6c0..e43e4ff5b11 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,15 +1,18 @@ -# Normal text let sit to auto -*.htm text -*.html text -*.css text -*.js text - -## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout. -*.sh text eol=lf -*.md text eol=lf -*.json text eol=lf -*.yml text eol=lf -*.csv text eol=lf -*.hl7 text eol=lf -.environment/sftp-conf/ssh_host_*_key text eol=lf - +# Normal text let sit to auto +*.htm text +*.html text +*.css text +*.js text + +## Declare files that will always have LF (aka \n aka 10 aka 0x0a) line endings on checkout. +*.sh text eol=lf +*.md text eol=lf +*.json text eol=lf +*.yml text eol=lf +*.csv text eol=lf +*.hl7 text eol=lf +.environment/sftp-conf/ssh_host_*_key text eol=lf +* text=auto +*.gradle text eol=lf + + diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a20397b4ebd..2360922c337 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { } dependencies { - val kotlinVersion by System.getProperties() + val kotlinVersion = KotlinVersion.CURRENT.toString() implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}") implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:12.1.1") } \ No newline at end of file diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index b64a5b7208e..16afe126e90 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -617,10 +617,19 @@ task("uploadSwaggerUI") { } tasks.register("killFunc") { - exec { - workingDir = project.rootDir + doLast { val processName = "func" - commandLine = listOf("sh", "-c", "pkill -9 $processName || true") + if (org.gradle.internal.os.OperatingSystem.current().isWindows) { + exec { + workingDir = project.rootDir + commandLine = listOf("cmd", "/c", "taskkill /F /IM $processName.exe || exit 0") + } + } else { + exec { + workingDir = project.rootDir + commandLine = listOf("sh", "-c", "pkill -9 $processName || true") + } + } } } diff --git a/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt b/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt index c0b172b699e..86686f264fe 100644 --- a/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt +++ b/prime-router/src/test/kotlin/cli/ValidateYMLCommandTests.kt @@ -134,8 +134,9 @@ class ValidateYMLCommandTests { "--type organizations --dir src/test/resources/yaml_validation/failure/recursive", ansiLevel = AnsiLevel.TRUECOLOR ) + val outputNormalized = result.stdout.replace("\\", "/") - assertThat(result.stdout).contains( + assertThat(outputNormalized).contains( "src/test/resources/yaml_validation/failure/recursive contains no YAML files!" ) assertThat(result.stderr).contains("No YAML files being validated!")