2022.3 support (#158)

* Added 2022.3 Build Support. * Bump Version.
ani-memes · Sep 25, 2022 · cab12d9 · cab12d9
1 parent c39d2fb
commit cab12d9
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # AMII Changelog
 
+## [1.1.0]
+
+### Added
+
+- 2022.3 Build Support
+
 ## [1.0.1]
 
 ### Fixed

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,9 @@ fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
   // Kotlin support
-  id("org.jetbrains.kotlin.jvm") version "1.6.0"
+  kotlin("jvm") version "1.7.10"
   // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-  id("org.jetbrains.intellij") version "1.7.0"
+  id("org.jetbrains.intellij") version "1.9.0"
   // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
   id("org.jetbrains.changelog") version "1.1.2"
   // detekt linter - read more: https://detekt.github.io/detekt/gradle.html

diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md
@@ -2,6 +2,7 @@
 
 - Custom Content, please <a href="https://github.com/ani-memes/AMII/tree/main#custom-assets">
   documentation</a> for more details!
+- 2022.3 Build Support
 
 ### Fixed
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@
 
 pluginGroup = io.unthrottled
 pluginName_ = Anime Memes
-pluginVersion = 1.0.1
+pluginVersion = 1.1.0
 pluginSinceBuild = 203.7148.57
-pluginUntilBuild = 222.*
+pluginUntilBuild = 223.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
 pluginVerifierIdeVersions = 2020.3.2,2021.1,2021.2,2022.1

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/io/unthrottled/amii/config/ui/CustomMemePanel.java b/src/main/java/io/unthrottled/amii/config/ui/CustomMemePanel.java
@@ -1,6 +1,5 @@
 package io.unthrottled.amii.config.ui;
 
-import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.ProjectManager;
@@ -155,7 +154,7 @@ private void createUIComponents() {
     );
 
     audioAssetTextField = new TextFieldWithBrowseButton();
-    audioAssetTextField.addActionListener(new ComponentWithBrowseButton.BrowseFolderActionListener<>(ExecutionBundle.message("select.working.directory.message"), null,
+    audioAssetTextField.addActionListener(new ComponentWithBrowseButton.BrowseFolderActionListener<>(PluginMessageBundle.message("select.working.directory.message"), null,
       audioAssetTextField,
       Arrays.stream(ProjectManager.getInstance().getOpenProjects()).findFirst().orElse(
         ProjectManager.getInstance().getDefaultProject()

diff --git a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt
@@ -25,6 +25,7 @@ private fun buildUpdateMessage(updateAsset: String): String =
         <li>Added Custom Content Support.</li>
         <li>Replay Previous Meme Replays Sound Now.</li>
         <li>Fixed Apex Unit Test Reactions</li>
+        <li>2022.3 Build Support</li>
       </ul>
       <br>See the <a href="https://github.com/ani-memes/AMII#documentation">documentation</a> for features, usages, and configurations.
       <br>The <a href="https://github.com/ani-memes/AMII/blob/master/CHANGELOG.md">changelog</a> is available for more details.

diff --git a/src/main/kotlin/io/unthrottled/amii/promotion/MemePromotionDialog.kt b/src/main/kotlin/io/unthrottled/amii/promotion/MemePromotionDialog.kt
@@ -5,7 +5,6 @@ import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.installAndEnable
 import com.intellij.ui.JBColor
-import com.intellij.ui.layout.panel
 import com.intellij.util.ui.UIUtil
 import io.unthrottled.amii.onboarding.UpdateNotification
 import io.unthrottled.amii.tools.Logging
@@ -115,13 +114,8 @@ class AniMemePromotionDialog(
     }
   }
 
-  override fun createCenterPanel(): JComponent? {
-    val promotionPane = buildPromotionPane()
-    return panel {
-      row {
-        promotionPane()
-      }
-    }
+  override fun createCenterPanel(): JComponent {
+    return buildPromotionPane()
   }
 
   @Suppress("LongMethod")

diff --git a/src/main/resources/messages/AMII.properties b/src/main/resources/messages/AMII.properties
@@ -132,3 +132,4 @@ amii.lewd.asset.assets.enabled.body=Local content tagged as suggestive will now
 amii.lewd.asset.assets.disabled.title=Suggestive Content Disabled
 amii.lewd.asset.assets.disabled.body=Local content tagged as suggestive will not show up.
 settings.custom.test.meme=Test Meme
+select.working.directory.message=Select Working Directory