Resolve displayName error in EAP

Fixes #459.
FWDekker · Jun 30, 2023 · b19e568 · b19e568
1 parent f2c4397
commit b19e568
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 34 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,8 +8,8 @@ fun properties(key: String) = project.findProperty(key).toString()
 plugins {
     // Compilation
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "1.6.21"  // See also `gradle.properties`
-    id("org.jetbrains.intellij") version "1.10.1"
+    id("org.jetbrains.kotlin.jvm") version "1.8.22"  // See also `gradle.properties`
+    id("org.jetbrains.intellij") version "1.14.2"
 
     // Tests/coverage
     id("jacoco")
@@ -18,7 +18,7 @@ plugins {
     id("io.gitlab.arturbosch.detekt") version "1.20.0"  // See also `gradle.properties`
 
     // Documentation
-    id("org.jetbrains.dokka") version "1.7.20"
+    id("org.jetbrains.dokka") version "1.8.20"
 }
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,36 +1,45 @@
 group   = com.fwdekker
-version = 2.7.6
+version = 2.7.7
 
 # Compatibility
 # * If latest is 20xx.y, then support at least [20xx-1].[y+1].
 #   e.g., if latest is 2020.3, support at least 2019.4 (aka 2020.1).
 #   See also https://data.services.jetbrains.com/products?fields=name,releases.version,releases.build&code=IC,CL.
-pluginSinceBuild          = 221.0
-intellijVersion           = 2022.1
-pluginVerifierIdeVersions = IC-2022.1.1, IC-2022.2.4, IC-2022.3, CL-2022.1.1, CL-2022.2.4, CL-2022.3
+pluginSinceBuild          = 222.0
+intellijVersion           = 2022.2
+pluginVerifierIdeVersions = IC-2022.2.5, IC-2022.3.3, IC-2023.1.3, CL-2022.2.5, CL-2022.3.3, CL-2023.1.4
 
 # Targets
-# * `javaVersion` is the same as `jvmVersion`.
-# * Kotlin should also be updated in `plugins` block.
-javaVersion      = 11
-jvmVersion       = 11
+# * Java
+#   * `javaVersion` is the same as `jvmVersion`.
+#   * Java version should be the one used by the oldest Randomness-supported version of IntelliJ, as listed in
+#     https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions
+#
+# * Kotlin
+#   * `kotlinVersion` is the same as `kotlinApiVersion`.
+#   * Kotlin should also be updated in `plugins` block.
+#   * Kotlin version should be bundled stdlib version of oldest supported IntelliJ version listed in
+#     https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+javaVersion      = 17
+jvmVersion       = 17
 kotlinVersion    = 1.6
 kotlinApiVersion = 1.6
 
 # Dependencies
 # * Detekt should also be updated in `plugins` block.
 # * Check https://github.com/assertj/assertj-swing/releases for valid AssertJ version combinations.
-assertjVersion        = 3.17.2
-assertjSwingVersion   = 3.17.1
-detektVersion         = 1.20.0
-emojiVersion          = 5.1.1
-jacocoVersion         = 0.8.8
-junitVersion          = 5.9.1
-junitRunnerVersion    = 1.9.1
-mockitoKotlinVersion  = 4.1.0
-spekVersion           = 2.0.19
-uuidGeneratorVersion  = 3.3.0
+assertjVersion       = 3.17.2
+assertjSwingVersion  = 3.17.1
+detektVersion        = 1.20.0
+emojiVersion         = 5.1.1
+jacocoVersion        = 0.8.8
+junitVersion         = 5.9.1
+junitRunnerVersion   = 1.9.1
+mockitoKotlinVersion = 4.1.0
+spekVersion          = 2.0.19
+uuidGeneratorVersion = 3.3.0
 
 # Kotlin
-kotlin.code.style                = official
-kotlin.stdlib.default.dependency = false
+kotlin.code.style                       = official
+kotlin.incremental.useClasspathSnapshot = false
+kotlin.stdlib.default.dependency        = false
diff --git a/src/main/kotlin/com/fwdekker/randomness/SettingsConfigurable.kt b/src/main/kotlin/com/fwdekker/randomness/SettingsConfigurable.kt
@@ -52,7 +52,7 @@ abstract class SettingsConfigurable<S : Settings<S, T>, T : Scheme<T>> : Configu
         val validationInfo = component.doValidate()
         if (validationInfo != null)
             throw ConfigurationException(validationInfo.message, "Failed to save settings")
-                .also { it.quickFix = validationInfo.quickFix }
+                .also { it.setQuickFix(validationInfo.quickFix) }
 
         component.saveSettings()
     }

diff --git a/src/main/resources/META-INF/change-notes.html b/src/main/resources/META-INF/change-notes.html
@@ -1,11 +1,13 @@
 <b>Breaking changes</b>
 <p>
-    Minimum IDE version has been increased to 2022.1.
+    Minimum IDE version has been increased to 2022.2.
 </p>
 <br />
 <b>Fixes</b>
 <p>
     Resolve compatibility issues with upcoming IDE versions.
+    (<a href="https://github.com/FWDekker/intellij-randomness/issues/459">#459</a>)
+    (<a href="https://github.com/FWDekker/intellij-randomness/issues/460">#460</a>)
 </p>
 <br />
 Change notes of previous updates can be found on the

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,7 @@
     <idea-version since-build="0.0" />  <!-- Patched in from `gradle.properties` -->
 
     <extensions defaultExtensionNs="com.intellij">
-        <errorHandler implementation="com.fwdekker.randomness.ErrorReporter"/>
+        <errorHandler implementation="com.fwdekker.randomness.ErrorReporter" />
 
         <!-- Persistence -->
         <applicationService serviceImplementation="com.fwdekker.randomness.integer.IntegerSettings" />
@@ -22,26 +22,32 @@
         <!-- Settings window -->
         <applicationConfigurable instance="com.fwdekker.randomness.RandomnessConfigurable"
                                  id="randomness.MainConfigurable"
-                                 groupId="tools"
-                                 bundle="randomness">
+                                 parentId="tools"
+                                 displayName="Randomness">
             <configurable instance="com.fwdekker.randomness.integer.IntegerSettingsConfigurable"
                           id="randomness.IntegerSettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="Integers" />
             <configurable instance="com.fwdekker.randomness.decimal.DecimalSettingsConfigurable"
                           id="randomness.DecimalSettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="Decimals" />
             <configurable instance="com.fwdekker.randomness.string.StringSettingsConfigurable"
                           id="randomness.StringSettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="Strings" />
             <configurable instance="com.fwdekker.randomness.word.WordSettingsConfigurable"
                           id="randomness.WordSettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="Words" />
             <configurable instance="com.fwdekker.randomness.uuid.UuidSettingsConfigurable"
                           id="randomness.UuidSettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="UUIDs" />
             <configurable instance="com.fwdekker.randomness.array.ArraySettingsConfigurable"
                           id="randomness.ArraySettingsConfigurable"
-                          parentId="randomness.MainConfigurable" />
+                          parentId="randomness.MainConfigurable"
+                          displayName="Arrays" />
         </applicationConfigurable>
     </extensions>