From 2c6f34829320e85fc8940a0793bdcad37b88d2d4 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Sat, 18 Nov 2023 10:51:48 -0500
Subject: [PATCH] GHA: Switch to kotlin 1.9.x to check if binaries are signed
 inside

---
 .github/scripts/sign-osx-distro-file.sh | 44 ++++++++++++-------------
 headless-services/commons/pom.xml       |  4 ++-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index f3589f48c..546eca6e0 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -25,28 +25,28 @@ do
 done
 
 # sign libjansi.jnilib inside kotlin-compiler-embeddable.jar
-for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/kotlin-compiler-embeddable.*\.jar$"`
-do
-  echo "Looking for 'libjansi.jnilib' files inside ${f} to sign..."
-  f_name="$(basename -- $f)"
-  extracted_jar_dir=extracted_${f_name}
-  rm -rf $extracted_jar_dir
-  mkdir $extracted_jar_dir
-  echo "Extracting archive ${f}"
-  unzip -q $f -d ./${extracted_jar_dir}
-  for jnilib_file in `find $extracted_jar_dir -type f | grep -E ".*/libjansi\.jnilib$"`
-  do
-    echo "Signing binary file: ${jnilib_file}"
-    codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $jnilib_file
-  done
-  cd $extracted_jar_dir
-  zip -r -u ../$f .
-  cd ..
-  rm -rf $extracted_jar_dir
-
-  echo "Signing binary file: ${f}"
-  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
-done
+#for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E ".*/kotlin-compiler-embeddable.*\.jar$"`
+#do
+#  echo "Looking for 'libjansi.jnilib' files inside ${f} to sign..."
+#  f_name="$(basename -- $f)"
+#  extracted_jar_dir=extracted_${f_name}
+#  rm -rf $extracted_jar_dir
+#  mkdir $extracted_jar_dir
+#  echo "Extracting archive ${f}"
+#  unzip -q $f -d ./${extracted_jar_dir}
+#  for jnilib_file in `find $extracted_jar_dir -type f | grep -E ".*/libjansi\.jnilib$"`
+#  do
+#    echo "Signing binary file: ${jnilib_file}"
+#    codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $jnilib_file
+#  done
+#  cd $extracted_jar_dir
+#  zip -r -u ../$f .
+#  cd ..
+#  rm -rf $extracted_jar_dir
+#
+#  echo "Signing binary file: ${f}"
+#  codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
+#done
 
 # Sign the app
 codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ${dir}/${destination_folder_name}/SpringToolSuite4.app
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index d435a4f33..c7ff48a7a 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -115,10 +115,11 @@
 		<reactor-netty>0.7.15.RELEASE</reactor-netty>
 		<commons-io-version>2.4</commons-io-version>
 		<commons-codec-version>1.13</commons-codec-version>
+		<kotlin.version>1.9.20</kotlin.version>
 
 		<!-- Rewrite specific properties -->
 		<rewrite-version>8.9.0-SNAPSHOT</rewrite-version>
-		<rewrite-kotlin-version>1.7.3</rewrite-kotlin-version>
+		<rewrite-kotlin-version>1.8.0-SNAPSHOT</rewrite-kotlin-version>
 		<rewrite-spring-version>5.1.0-SNAPSHOT</rewrite-spring-version>
 		<rewrite-gradle-tooling-api-version>1.3.2</rewrite-gradle-tooling-api-version>
 		
@@ -209,4 +210,5 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
 </project>