Skip to content

Commit

Permalink
Merge pull request #67 from intuit/upgrade-plugin-version
Browse files Browse the repository at this point in the history
upgrade plugin version 2.2.5 and upgrade kotlin jvm version to 1.9.0
  • Loading branch information
HilaG authored Jun 24, 2024
2 parents e2167de + 2218bbc commit 33bf455
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 33bf455

Please sign in to comment.