Merge pull request #62 from intuit/221

Support for IntelliJ 2023.1
intuit · Dec 17, 2023 · c907b1c · c907b1c
2 parents bd30f3e + 7a42f91
commit c907b1c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # DockDockBuild Changelog
 
+## [2.2.1]
+### Fixed
+- getId() Intellij warning
+### Changed
+- Support for IntelliJ 2023.1
+
 ## [2.2.0]
 ### Changed
 - Update Java to v17

diff --git a/build.gradle.bak b/build.gradle.bak
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm") version "1.7.10"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.7.0"
+    id("org.jetbrains.intellij") version "1.10.1"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin

diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,16 @@
 pluginGroup = com.intuit.dockdockbuild
 pluginName = DockDockBuild
 # SemVer format -> https://semver.org
-pluginVersion = 2.2.0
+pluginVersion = 2.2.1
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 222
-pluginUntilBuild = 223.*
+pluginSinceBuild = 231
+pluginUntilBuild = 232.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-platformVersion = 2022.2
+platformVersion = 2023.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/settings.gradle.bak b/settings.gradle.bak
diff --git a/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildProjectSettings.kt b/src/main/kotlin/com/intuit/ddb/conf/DockDockBuildProjectSettings.kt
@@ -1,12 +1,14 @@
 package com.intuit.ddb.conf
 
 import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.StoragePathMacros
 import com.intuit.ddb.DockDockBuildSettings
 
 @State(name = "DockDockBuild.Settings", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
+@Service(Service.Level.PROJECT)
 class DockDockBuildProjectSettings : PersistentStateComponent<DockDockBuildSettings> {
     var settings: DockDockBuildSettings = DockDockBuildSettings()
 

diff --git a/src/main/kotlin/name/kropp/intellij/makefile/MakefileColorSettingsPage.kt b/src/main/kotlin/name/kropp/intellij/makefile/MakefileColorSettingsPage.kt
@@ -5,7 +5,7 @@ import com.intellij.openapi.options.colors.ColorDescriptor
 import com.intellij.openapi.options.colors.ColorSettingsPage
 
 class MakefileColorSettingsPage : ColorSettingsPage {
-    override fun getDisplayName() = MakefileLanguage.displayName
+    override fun getDisplayName() = "Makefile"
     override fun getIcon() = MakefileIcon
 
     private val tags = mapOf(

diff --git a/src/main/kotlin/name/kropp/intellij/makefile/MakefileDocumentationProvider.kt b/src/main/kotlin/name/kropp/intellij/makefile/MakefileDocumentationProvider.kt
@@ -1,10 +1,10 @@
 package name.kropp.intellij.makefile
 
-import com.intellij.lang.documentation.DocumentationProviderEx
+import com.intellij.lang.documentation.AbstractDocumentationProvider
 import com.intellij.psi.PsiElement
 import name.kropp.intellij.makefile.psi.MakefileTarget
 
-class MakefileDocumentationProvider : DocumentationProviderEx() {
+class MakefileDocumentationProvider : AbstractDocumentationProvider() {
     override fun getQuickNavigateInfo(element: PsiElement, originalElement: PsiElement?) = (element as? MakefileTarget)?.docComment
     override fun generateDoc(element: PsiElement?, originalElement: PsiElement?) = (element as? MakefileTarget)?.docComment
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,19 +1,18 @@
 <idea-plugin>
   <id>com.intuit.intellij.makefile</id>
   <name>DockDockBuild</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <vendor email="[email protected]" url="https://www.intuit.com/">Intuit</vendor>
 
   <description>Support for running UNIX Makefiles on a Docker container</description>
 
   <change-notes><![CDATA[
     <ul>
-      <li>Update to Java 17 - mandatory for IntelliJ 2022.2+</li>
-      <li>Support for IntelliJ 2022.2</li>
+      <li>Support for IntelliJ 2023.1</li>
     </ul>
   ]]></change-notes>
 
-  <idea-version since-build="222"/>
+  <idea-version since-build="231" until-build="232.*"/>
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.platform</depends>
@@ -32,7 +31,7 @@
     <colorSettingsPage implementation="name.kropp.intellij.makefile.MakefileColorSettingsPage"/>
     <completion.contributor language="Makefile" implementationClass="name.kropp.intellij.makefile.MakefileCompletionContributor"/>
     <configurationType implementation="com.intuit.ddb.conf.DockDockBuildRunConfigurationType"/>
-    <projectService serviceImplementation="com.intuit.ddb.conf.DockDockBuildProjectSettings"/>
+<!--    <projectService serviceImplementation="com.intuit.ddb.conf.DockDockBuildProjectSettings"/>-->
     <projectConfigurable groupId="build.tools" groupWeight="110" id="reference.settingsdialog.project.make"
                          instance="com.intuit.ddb.DockDockBuildConfigurable"/>
     <runLineMarkerContributor language="Makefile" implementationClass="name.kropp.intellij.makefile.MakefileTargetRunLineMarkerContributor"/>