2021.2 Build Support (#55)

* Bump org.jetbrains.intellij from 0.7.3 to 1.0

Bumps org.jetbrains.intellij from 0.7.3 to 1.0.

Signed-off-by: dependabot[bot] <support@github.com>

* Fixo Buildo

* Added 2021.2 Build Support

* Fixo Buildo

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: DATBOI <alexsimons9999@gmail.com>

build.gradle

@@ -1,5 +1,9 @@
+def properties(String key) {
+  return project.findProperty(key).toString()
+}
+
 plugins {
-  id 'org.jetbrains.intellij' version '0.7.3'
+  id 'org.jetbrains.intellij' version '1.0'
   id "org.jetbrains.kotlin.jvm" version "1.5.10"
   id 'org.kordamp.gradle.markdown' version '2.2.0'
   id "org.jlleitschuh.gradle.ktlint" version "10.0.0"
@@ -9,7 +13,7 @@ repositories {
 }
 
 group 'io.unthrottled'
-version '1.9.9'
+version '1.9.10'
 
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
@@ -23,13 +27,12 @@ configurations {
 }
 
 intellij {
-  version 'LATEST-EAP-SNAPSHOT'
-  type 'IU'
-  alternativeIdePath idePath
-
+  version.set('LATEST-EAP-SNAPSHOT')
+  type.set('IC')
   if (System.getenv().getOrDefault("ENV", "") == "DEV") {
-    plugins(
-//      'io.acari.DDLCTheme:11.3.1'
+    plugins.set(
+      Collections.emptyList()
+//      Collections.singletonList('io.acari.DDLCTheme:15.1.0')
     )
   }
 }
@@ -46,13 +49,20 @@ markdownToHtml {
   outputDir file("$projectDir/build/html")
 }
 
-patchPluginXml {
+tasks.runIde {
+  idePath = properties("idePath")
+  if (!idePath.isEmpty()) {
+    ideDir.set(file(idePath))
+  }
+}
+
+tasks.patchPluginXml {
   def releaseNotes = "$projectDir/build/html/RELEASE-NOTES.html"
   if (file(releaseNotes).exists()) {
-    changeNotes file(releaseNotes).text
+    changeNotes.set(file(releaseNotes).text)
   }
-  sinceBuild System.getenv("pluginSinceBuild") ?: sinceBuildP
-  untilBuild System.getenv("pluginUntilBuild") ?: untilBuildP
+  sinceBuild.set(System.getenv("pluginSinceBuild") ?: sinceBuildP)
+  untilBuild.set(System.getenv("pluginUntilBuild") ?: untilBuildP)
 }
 
 tasks.patchPluginXml.dependsOn("markdownToHtml")

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 ---- 
 
+# 1.9.10 [Maintenance]
+
+- 2021.2 Build Support
+
 # 1.9.9 [Maintenance]
 
 - 2020.3 Build Support.

docs/RELEASE-NOTES.md

@@ -1,3 +1,3 @@
-- 2020.3 Build Support.
+- 2021.2 Build Support.
 
 Please see the <a href="https://github.com/Unthrottled/normandy-progress-bar/blob/master/docs/CHANGELOG.md">Changelog</a> for more information.

gradle.properties

@@ -8,7 +8,7 @@
 idePath=
 
 sinceBuildP=203
-untilBuildP=211.*
+untilBuildP=212.*
 
 intellijPublishUsername=alexsimons999
 intellijPublishPassword=

src/main/kotlin/io/unthrottled/n7/notification/NotificationService.kt

@@ -34,10 +34,10 @@ object NotificationService {
     showNotification(
       project,
       notificationGroup.createNotification(
-        "SSV Normandy Progress Bar updated to $currentVersion",
         UPDATE_MESSAGE,
         NotificationType.INFORMATION
       )
+        .setTitle("SSV Normandy Progress Bar updated to $currentVersion")
         .setListener(NotificationListener.UrlOpeningListener(false))
         .setIcon(NOTIFICATION_ICON)
     )

src/main/kotlin/io/unthrottled/n7/notification/UpdateComponent.kt

@@ -17,7 +17,7 @@ val UPDATE_MESSAGE =
   """
       What's New?<br>
       <ul>
-        <li>2021.1 Build Support</li>
+        <li>2021.2 Build Support</li>
       </ul>
       <br>
       <br>Please see the <a href="https://github.com/Unthrottled/normandy-progress-bar/blob/master/docs/CHANGELOG.md">Changelog</a> for more details.