From 2218bbcccf2eb9e49ddffd9c6bf206ddc843b73c Mon Sep 17 00:00:00 2001
From: skozenyuk <shahar_kozenyuk@intuit.com>
Date: Mon, 24 Jun 2024 14:56:16 +0300
Subject: [PATCH] upgrade plugin version 2.2.5 and upgrade kotlin jvm version
 to 1.9.0

---
 build.gradle.kts                                              | 2 +-
 gradle.properties                                             | 4 ++--
 .../com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt      | 3 +--
 src/main/resources/META-INF/plugin.xml                        | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 006fe37..3b866bd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
+    id("org.jetbrains.kotlin.jvm") version "1.9.0"
     // Gradle IntelliJ Plugin
     id("org.jetbrains.intellij") version "1.10.1"
     // Gradle Changelog Plugin
diff --git a/gradle.properties b/gradle.properties
index 0d8a1ef..cce1399 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = com.intuit.dockdockbuild
 pluginName = DockDockBuild
 # SemVer format -> https://semver.org
-pluginVersion = 2.2.4
+pluginVersion = 2.2.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
@@ -13,7 +13,7 @@ pluginUntilBuild = 241.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-platformVersion = 2023.1
+platformVersion = 2024.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
diff --git a/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt b/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt
index d3fa989..c889af5 100644
--- a/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt
+++ b/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt
@@ -9,7 +9,6 @@ import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.process.ProcessTerminatedListener
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.openapi.project.Project
-import com.intellij.util.getOrCreate
 import com.intellij.util.lang.UrlClassLoader
 import com.intuit.ddb.* // ktlint-disable no-wildcard-imports
 import org.jdom.Element
@@ -50,7 +49,7 @@ open class DockDockBuildRunConfiguration(project: Project, factoryDocker: DockDo
 
     override fun writeExternal(element: Element) {
         super.writeExternal(element)
-        val child = element.getOrCreate(DOCKER_MAKE)
+        val child = element.getOrCreateChild(DOCKER_MAKE)
         child.setAttribute(MAKEFILE_FILEPATH, makefileFilePath)
         child.setAttribute(DOCKER_FILENAME, dockerfileDir)
         child.setAttribute(DOCKER_IMAGE, dockerImageUrl)
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 53a4a17..cd12321 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>com.intuit.intellij.makefile</id>
   <name>DockDockBuild</name>
-  <version>2.2.4</version>
+  <version>2.2.5</version>
   <vendor email="hila_goel@intuit.com" url="https://www.intuit.com/">Intuit</vendor>
 
   <description>Support for running UNIX Makefiles on a Docker container</description>
@@ -12,7 +12,7 @@
     </ul>
   ]]></change-notes>
 
-  <idea-version since-build="222"/>
+  <idea-version since-build="241"/>
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.platform</depends>