Added 2022.1 Build Support (#126)

ani-memes · Aug 10, 2022 · ac3666d · ac3666d
1 parent b66f591
commit ac3666d
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # AMII Android Extensions Changelog
 
+## [0.2.0]
+
+## Added
+
+- 2022.1 Build Support
+
 ## [0.1.1]
 
 ## Added

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,7 +69,7 @@ intellij {
   updateSinceUntilBuild.set(true)
 
   // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-  plugins.set(listOf("io.unthrottled.amii:0.14.1", "android", "org.jetbrains.android"))
+  plugins.set(listOf("io.unthrottled.amii:0.15.1", "android", "org.jetbrains.android"))
 }
 
 // Configure detekt plugin.

diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md
@@ -1,3 +1,3 @@
 ## Added
 
-- 2021.3 Build Support
+- 2022.1 Build Support
diff --git a/gradle.properties b/gradle.properties
@@ -3,12 +3,12 @@
 
 pluginGroup = io.unthrottled
 pluginName_ = Anime Memes - Android Extension
-pluginVersion = 0.1.1
-pluginSinceBuild = 202.6397.94
-pluginUntilBuild = 213.*
+pluginVersion = 0.2.0
+pluginSinceBuild = 203.5981.155
+pluginUntilBuild = 221.*
 # 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.4, 2021.3.2
+pluginVerifierIdeVersions = 2021.1, 2021.3.2, 2022.1.4
 
 platformType = IU
 platformVersion = 2021.3.2

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-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/unthrottled/amii/android/PluginMaster.kt b/src/main/kotlin/io/unthrottled/amii/android/PluginMaster.kt
@@ -56,7 +56,7 @@ internal data class ProjectListeners(
 ) : Disposable {
 
   init {
-    GradleBuildInvoker.getInstance(project).add(GradleListener(project))
+    project.getService(GradleBuildInvoker::class.java)?.add(GradleListener(project))
   }
 
   override fun dispose() {

diff --git a/src/main/kotlin/io/unthrottled/amii/android/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/amii/android/onboarding/UpdateNotification.kt
@@ -1,8 +1,7 @@
 package io.unthrottled.amii.android.onboarding
 
 import com.intellij.notification.Notification
-import com.intellij.notification.NotificationDisplayType
-import com.intellij.notification.NotificationGroup
+import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationListener
 import com.intellij.notification.NotificationType
 import com.intellij.notification.impl.NotificationsManagerImpl
@@ -23,7 +22,7 @@ private fun buildUpdateMessage(updateAsset: String): String =
   """
       What's New?<br>
       <ul>
-        <li>Added Jetbrains Platform 2021.3 Build Support</li>
+        <li>Added Jetbrains Platform 2022.1 Build Support</li>
       </ul>
       <br>See the <a href="https://github.com/ani-memes/amii-android-extension#documentation">documentation</a> for features, usages, and configurations.
       <br>The <a href="https://github.com/ani-memes/amii-android-extension/blob/master/CHANGELOG.md">changelog</a> is available for more details.
@@ -37,12 +36,8 @@ private fun buildUpdateMessage(updateAsset: String): String =
 object UpdateNotification {
 
   private const val UPDATE_CHANNEL_NAME = "$PLUGIN_NAME Updates"
-  private val notificationGroup = NotificationGroup(
-    UPDATE_CHANNEL_NAME,
-    NotificationDisplayType.STICKY_BALLOON,
-    false,
-    UPDATE_CHANNEL_NAME
-  )
+  private val notificationGroup = NotificationGroupManager.getInstance()
+    .getNotificationGroup(UPDATE_CHANNEL_NAME)
 
   fun display(
     project: Project,
@@ -87,10 +82,12 @@ object UpdateNotification {
     listener: NotificationListener? = defaultListener
   ) {
     notificationGroup.createNotification(
-      title,
       content,
-      listener = listener
-    ).setIcon(PLUGIN_ICON)
+      NotificationType.INFORMATION
+    )
+      .setTitle(title)
+      .setIcon(PLUGIN_ICON)
+      .setListener(listener ?: defaultListener)
       .notify(project)
   }
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
   <name>Anime Memes - Android Extension</name>
   <vendor>Unthrottled</vendor>
 
-  <idea-version since-build="203.5981.141"/>
+  <idea-version since-build="203.5981.155"/>
 
   <!-- Product and plugin compatibility requirements -->
   <!-- https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->
@@ -15,6 +15,8 @@
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="io.unthrottled.amii.android.config.Config"/>
     <applicationService serviceImplementation="io.unthrottled.amii.android.PluginMaster"/>
+    <notificationGroup displayType="BALLOON" id="AMII - Android Extension Updates"
+                       isLogByDefault="false" toolWindowId="AMII - Android Extension Updates" />
   </extensions>
 
   <applicationListeners>