Skip to content

Commit

Permalink
Use new NotificationGroup::createNotification (closes #913)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkondratek committed Aug 24, 2022
1 parent 83ffbfd commit 76df586
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGE-NOTES.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p>Dropped support for IntelliJ 2020.3 and 2021.1.</p>
<p>Dropped support for IntelliJ 2021.2.</p>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ even when **multiple branches** are present in the repository
🎯 With this plugin, you can maintain **small, focused, easy-to-review pull requests** with little effort.

⚙ It is compatible with all JetBrains products (including Android Studio since plugin version 0.9.0).
The minimum required version is 2021.2.
The minimum required version is 2021.3.


🖥 For the console version, check [git-machete](https://github.com/VirtusLab/git-machete#git-machete).
Expand Down
2 changes: 2 additions & 0 deletions config/checker/com.intellij.astub
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ class NotificationAction {

class NotificationGroup {
Notification createNotification(@Tainted String title, @Tainted String content, NotificationType type, @Nullable NotificationListener listener);

Notification createNotification(@Tainted String title, @Tainted String content, NotificationType type);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ private void handleResult(
String content = getBodyForUpdateNotification(notificationData.getFilteredCommitsCount());
notification = VcsNotifier.STANDARD_NOTIFICATION.createNotification(title,
content,
INFORMATION,
/* listener */ null);
INFORMATION);
notification.addAction(NotificationAction.createSimple(getString(
"action.GitMachete.GitCommandUpdatingCurrentBranchBackgroundable.notification.message.view-commits"),
notificationData.getViewCommitAction()));
Expand All @@ -162,7 +161,7 @@ private void handleResult(
notification = VcsNotifier.STANDARD_NOTIFICATION.createNotification(
getString(
"action.GitMachete.GitCommandUpdatingCurrentBranchBackgroundable.notification.title.all-files-are-up-to-date"),
/* content */ "", INFORMATION, /* listener */ null);
/* content */ "", INFORMATION);
}
VcsNotifier.getInstance(project).notify(notification);

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pluginPackages-jetbrains-grammarkit = "org.jetbrains.intellij.plugins:gradle-gra
pluginPackages-jetbrains-intellij = "org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.8.0"
# @pin because as per https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library:
# "If a plugin supports multiple platform versions, it must (...) target the lowest bundled stdlib version"
# which is different in our case (as this is the Kotlin version bundled into IntelliJ 2021.2).
# which is different in our case (as this is the Kotlin version bundled into IntelliJ 2021.3).
pluginPackages-jetbrains-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
pluginPackages-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.10.0"
pluginPackages-taskTree = "com.dorongold.plugins:task-tree:2.1.0"
Expand Down
4 changes: 2 additions & 2 deletions intellijVersions.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Aug 18 00:07:22 UTC 2022
latestMinorsOfOldSupportedMajors=2021.2.4,2021.3.3,2022.1.4
latestMinorsOfOldSupportedMajors=2021.3.3,2022.1.4
eapOfLatestSupportedMajor=
earliestSupportedMajor=2021.2
earliestSupportedMajor=2021.3
latestStable=2022.2.1

0 comments on commit 76df586

Please sign in to comment.