From 004b9b79e81eeec8ed1f5ca04dad3e0e008b8143 Mon Sep 17 00:00:00 2001
From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com>
Date: Tue, 25 Mar 2025 01:54:15 +0530
Subject: [PATCH] [Windows] Fix SBT version issue and Pinning Kotlin version
 (#11866)

* [Windows] Fix SBT version issue and Pinning Kotlin version

* [Windows]Removing try catch block and adding script version
---
 images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +-
 images/windows/toolsets/toolset-2019.json                  | 7 ++++++-
 images/windows/toolsets/toolset-2022.json                  | 7 ++++++-
 images/windows/toolsets/toolset-2025.json                  | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1
index 68446bd5d..d86440094 100644
--- a/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1
+++ b/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1
@@ -166,7 +166,7 @@ function Get-GradleVersion {
 }
 
 function Get-SbtVersion {
-    (sbt -version) -match "sbt runner" | Get-StringPart -Part 3
+    sbt --script-version
 }
 
 function Get-DotnetSdks {
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index c3782dde5..905d12e9f 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -452,7 +452,12 @@
         "installVcRedist": true
     },
     "kotlin": {
-        "version": "latest"
+        "version": "2.1.10",
+        "pinnedDetails": {
+            "link": "https://youtrack.jetbrains.com/issues/KT?preview=KT-76169",
+            "reason": "this was pinned due to a new version 2.1.20 released has an issue with kotlinc-js -version` and kapt -version",
+            "review-at": "2025-03-31"
+        }
     },
     "openssl": {
         "version": "1.1.1",
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 7df92a5c1..691fa3a96 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -373,7 +373,12 @@
         "installVcRedist": true
     },
     "kotlin": {
-        "version": "latest"
+        "version": "2.1.10",
+        "pinnedDetails": {
+            "link": "https://youtrack.jetbrains.com/issues/KT?preview=KT-76169",
+            "reason": "this was pinned due to a new version 2.1.20 released has an issue with kotlinc-js -version` and kapt -version",
+            "review-at": "2025-03-31"
+        }
     },
     "openssl": {
         "version": "1.1.1",
diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json
index 92db673a1..4e184c5d3 100644
--- a/images/windows/toolsets/toolset-2025.json
+++ b/images/windows/toolsets/toolset-2025.json
@@ -327,7 +327,12 @@
         "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9"
     },
     "kotlin": {
-        "version": "latest"
+        "version": "2.1.10",
+        "pinnedDetails": {
+            "link": "https://youtrack.jetbrains.com/issues/KT?preview=KT-76169",
+            "reason": "this was pinned due to a new version 2.1.20 released has an issue with kotlinc-js -version` and kapt -version",
+            "review-at": "2025-03-31"
+        }
     },
     "openssl": {
         "version": "3.4.1",