Support dynamic reloading (#341)

ben-gibson · Sep 2, 2024 · f82ccf9 · f82ccf9
1 parent 06f163a
commit f82ccf9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## Unreleased
 
+- Fix warnings and deprecations
+- Support dynamic reloading
+
 ## 4.5.0 - 2024-09-02
 
 - Fix BitBucket cloud URL generation when the remote contains scm (#333)

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = uk.co.ben_gibson.git.link
 pluginName = GitLink
 # SemVer format -> https://semver.org
-pluginVersion = 4.5.0
+pluginVersion = 4.5.1
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/GitLinkBundle.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/GitLinkBundle.kt
@@ -8,13 +8,12 @@ import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.Project
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
-import java.net.URL
 
 @NonNls
 private const val BUNDLE = "messages.MyBundle"
 
 object GitLinkBundle : DynamicBundle(BUNDLE) {
-    val URL_BUG_REPORT = URL("https://github.com/ben-gibson/GitLink/issues")
+    const val URL_BUG_REPORT = "https://github.com/ben-gibson/GitLink/issues"
 
     @Suppress("SpreadOperator")
     @JvmStatic

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/settings/ProjectSettings.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/settings/ProjectSettings.kt
@@ -1,6 +1,7 @@
 package uk.co.ben_gibson.git.link.settings
 
 import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.util.xmlb.XmlSerializerUtil
@@ -10,6 +11,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil
  * The [State] and [Storage] annotations define the name of the data and the file name where
  * these persistent application settings are stored.
  */
+@Service(Service.Level.PROJECT)
 @State(name = "uk.co.ben_gibson.git.link.SettingsState", storages = [Storage("GitLink.xml")])
 class ProjectSettings : PersistentStateComponent<ProjectSettings?> {
     var host: String? = null

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/CustomPlatformSettingsConfigurable.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/CustomPlatformSettingsConfigurable.kt
@@ -42,7 +42,7 @@ class CustomPlatformSettingsConfigurable : BoundConfigurable(message("settings.c
                 .align(Align.FILL)
         }
         row {
-            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT.toString())
+            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT)
         }
     }
 

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/DomainRegistrySettings.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/DomainRegistrySettings.kt
@@ -70,7 +70,7 @@ class DomainRegistrySettings : BoundConfigurable(message("settings.domain-regist
                 .align(Align.FILL)
         }
         row {
-            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT.toString())
+            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT)
         }
     }
 

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/ProjectSettingsConfigurable.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/ui/settings/ProjectSettingsConfigurable.kt
@@ -53,7 +53,7 @@ class ProjectSettingsConfigurable(project : Project) : BoundConfigurable(message
             }
         }
         row {
-            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT.toString())
+            browserLink(message("actions.report-bug.title"), GitLinkBundle.URL_BUG_REPORT)
         }
     }
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -11,9 +11,7 @@
     </description>
 
     <extensions defaultExtensionNs="com.intellij">
-        <projectService serviceImplementation="uk.co.ben_gibson.git.link.settings.ProjectSettings"/>
         <applicationService serviceImplementation="uk.co.ben_gibson.git.link.settings.ApplicationSettings"/>
-        <notification.parentGroup id="git.link.notifications"/>
         <notificationGroup id="git.link.notification.general" displayType="BALLOON" key="notification.group.general.name" />
         <notificationGroup id="git.link.notification.important" displayType="STICKY_BALLOON" key="notification.group.important.name" />
         <postStartupActivity implementation="uk.co.ben_gibson.git.link.listener.ApplicationStartupListener"/>