From 429d53477d5af011c9b601c3f556cc5cb460279f Mon Sep 17 00:00:00 2001
From: Robert Murdock <robertfmurdock@MacBook-Pro.local>
Date: Fri, 7 Jul 2023 11:05:34 -0400
Subject: [PATCH] fixing m2 compatibility issues

---
 .idea/codeStyles/Project.xml                  | 10 ++++
 .idea/codeStyles/codeStyleConfig.xml          |  5 ++
 .idea/gradle.xml                              |  4 +-
 .../zegreatrob/coupling/plugins/NodeExec.kt   | 57 ++-----------------
 4 files changed, 22 insertions(+), 54 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..1bec35e570
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,10 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..79ee123c2b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b8a6c35caa..b7296dc026 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -15,7 +16,8 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/8.2/libexec" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/NodeExec.kt b/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/NodeExec.kt
index d442084544..5468b3afc2 100644
--- a/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/NodeExec.kt
+++ b/coupling-plugins/src/main/kotlin/com/zegreatrob/coupling/plugins/NodeExec.kt
@@ -7,6 +7,7 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
 import java.io.File
 import java.io.FileOutputStream
 
@@ -63,61 +64,11 @@ open class NodeExec : AbstractExecTask<NodeExec>(NodeExec::class.java) {
 }
 
 fun NodeExec.setup(project: Project) {
+    val nodeJs = NodeJsRootPlugin.apply(project.rootProject)
+    nodeBinDir = nodeJs.requireConfigured().nodeBinDir
+    nodeExecPath = nodeJs.requireConfigured().nodeExecutable
     projectNodeModulesDir = project.nodeModulesDir
-    nodeBinDir = project.nodeBinDir
-    nodeExecPath = project.nodeExecPath
 }
 
-private fun Project.goGetNodeBinDir(): File {
-    val props = System.getProperties()
-    fun property(name: String) = props.getProperty(name) ?: System.getProperty(name)
-    val win = "win"
-    val darwin = "darwin"
-    val linux = "linux"
-    val sunos = "sunos"
-
-    val platform: String = run {
-        val name = property("os.name").lowercase()
-        when {
-            name.contains("windows") -> win
-            name.contains("mac") -> darwin
-            name.contains("linux") -> linux
-            name.contains("freebsd") -> linux
-            name.contains("sunos") -> sunos
-            else -> throw IllegalArgumentException("Unsupported OS: $name")
-        }
-    }
-    val x64 = "x64"
-    val x86 = "x86"
-    val arm64 = "arm64"
-
-    val architecture: String = run {
-        val arch = property("os.arch").lowercase()
-        when {
-            arch.contains("64") -> x64
-            arch == "arm" -> {
-                // as Java just returns "arm" on all ARM variants, we need a system call to determine the exact arch
-                // the node binaries for 'armv8l' are called 'arm64', so we need to distinguish here
-                val process = Runtime.getRuntime().exec("uname -m")
-                val systemArch = process.inputStream.bufferedReader().use { it.readText() }
-                when (systemArch.trim()) {
-                    "armv8l" -> arm64
-                    else -> systemArch
-                }
-            }
-            else -> x86
-        }
-    }
-    val nodeJs = NodeJsRootPlugin.apply(this)
-    val installationDir = nodeJs.installationDir
-    val nodeDir = installationDir.resolve("node-v${nodeJs.nodeVersion}-$platform-$architecture")
-
-    val isWindows = platform == win
-    return if (isWindows) nodeDir else nodeDir.resolve("bin")
-}
 
 val Project.nodeModulesDir get() = rootProject.buildDir.resolve("js/node_modules")
-
-private val Project.nodeExecPath get() = "$nodeBinDir/node"
-
-private val Project.nodeBinDir get() = project.rootProject.goGetNodeBinDir()