change plugin id (#164)

conan-io · Sep 7, 2023 · 4e24d47 · 4e24d47
1 parent f20cfb7
commit 4e24d47
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## [Unreleased]
 
+### Changed
+- Change plugin id to avoid configuration defect error
+
 ## [2.0.2] - 2023-09-07
 
 ### Bugfix

diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
-pluginGroup = com.jfrog.conan.clion
+pluginGroup = com.jfrog.conan.plugin
 pluginName = Conan
 pluginRepositoryUrl = https://github.com/conan-io/conan-clion-plugin/
 # SemVer format -> https://semver.org
-pluginVersion = 2.0.2
+pluginVersion = 2.0.3
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 223

diff --git a/...com/jfrog/conan/clion/bundles/UIBundle.kt → ...om/jfrog/conan/plugin/bundles/UIBundle.kt b/...com/jfrog/conan/clion/bundles/UIBundle.kt → ...om/jfrog/conan/plugin/bundles/UIBundle.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.bundles
+package com.jfrog.conan.plugin.bundles
 
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.NonNls

diff --git a/...tlin/com/jfrog/conan/clion/cmake/CMake.kt → ...lin/com/jfrog/conan/plugin/cmake/CMake.kt b/...tlin/com/jfrog/conan/clion/cmake/CMake.kt → ...lin/com/jfrog/conan/plugin/cmake/CMake.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.cmake
+package com.jfrog.conan.plugin.cmake
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.notification.NotificationGroupManager
@@ -11,9 +11,9 @@ import com.intellij.openapi.ui.Messages
 import com.jetbrains.cidr.cpp.cmake.CMakeSettings
 import com.jetbrains.cidr.cpp.cmake.model.CMakeConfiguration
 import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.models.PersistentStorageKeys
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.models.PersistentStorageKeys
+import com.jfrog.conan.plugin.services.ConanService
 
 class CMake(val project: Project) {
 
@@ -140,7 +140,7 @@ class CMake(val project: Project) {
             if (isCMakeParallel) {
                 AdvancedSettings.setBoolean("cmake.reload.profiles.sequentially", true)
                 NotificationGroupManager.getInstance()
-                    .getNotificationGroup("com.jfrog.conan.clion.notifications.general")
+                    .getNotificationGroup("com.jfrog.conan.plugin.notifications.general")
                     .createNotification(
                         UIBundle.message("cmake.parallel.autoactivated.title"),
                         UIBundle.message("cmake.parallel.autoactivated.body"),
@@ -150,7 +150,7 @@ class CMake(val project: Project) {
             }
         } else if (isCMakeParallel && listOf(1).size > 1) {
             NotificationGroupManager.getInstance()
-                .getNotificationGroup("com.jfrog.conan.clion.notifications.general")
+                .getNotificationGroup("com.jfrog.conan.plugin.notifications.general")
                 .createNotification(
                     UIBundle.message("cmake.parallel.notactivated.title"),
                     UIBundle.message("cmake.parallel.notactivated.body"),

diff --git a/...rog/conan/clion/conan/ConanPluginUtils.kt → ...og/conan/plugin/conan/ConanPluginUtils.kt b/...rog/conan/clion/conan/ConanPluginUtils.kt → ...og/conan/plugin/conan/ConanPluginUtils.kt
@@ -1,7 +1,7 @@
-package com.jfrog.conan.clion.conan
+package com.jfrog.conan.plugin.conan
 
 import com.intellij.openapi.project.Project
-import com.jfrog.conan.clion.models.LibraryData
+import com.jfrog.conan.plugin.models.LibraryData
 import java.io.File
 import java.nio.file.Paths
 

diff --git a/...og/conan/clion/conan/datamodels/Recipe.kt → ...g/conan/plugin/conan/datamodels/Recipe.kt b/...og/conan/clion/conan/datamodels/Recipe.kt → ...g/conan/plugin/conan/datamodels/Recipe.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.conan.datamodels
+package com.jfrog.conan.plugin.conan.datamodels
 
 import kotlinx.serialization.Serializable
 

diff --git a/...frog/conan/clion/conan/extensions/file.kt → ...rog/conan/plugin/conan/extensions/file.kt b/...frog/conan/clion/conan/extensions/file.kt → ...rog/conan/plugin/conan/extensions/file.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.conan.extensions
+package com.jfrog.conan.plugin.conan.extensions
 
 import com.intellij.openapi.diagnostic.thisLogger
 import kotlinx.coroutines.Dispatchers

diff --git a/...an/clion/dialogs/ConanExecutableDialog.kt → ...n/plugin/dialogs/ConanExecutableDialog.kt b/...an/clion/dialogs/ConanExecutableDialog.kt → ...n/plugin/dialogs/ConanExecutableDialog.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.dialogs
+package com.jfrog.conan.plugin.dialogs
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.components.service
@@ -11,10 +11,10 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.ui.JBUI
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.cmake.CMake
-import com.jfrog.conan.clion.models.PersistentStorageKeys
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.cmake.CMake
+import com.jfrog.conan.plugin.models.PersistentStorageKeys
+import com.jfrog.conan.plugin.services.ConanService
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
 import javax.swing.BoxLayout

diff --git a/...ion/dialogs/ConanInspectPackagesDialog.kt → ...gin/dialogs/ConanInspectPackagesDialog.kt b/...ion/dialogs/ConanInspectPackagesDialog.kt → ...gin/dialogs/ConanInspectPackagesDialog.kt
@@ -1,12 +1,12 @@
-package com.jfrog.conan.clion.dialogs
+package com.jfrog.conan.plugin.dialogs
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.components.JBScrollPane
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.services.ConanService
-import com.jfrog.conan.clion.toolWindow.UsedPackagesPanel
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.services.ConanService
+import com.jfrog.conan.plugin.toolWindow.UsedPackagesPanel
 import java.awt.FlowLayout
 import javax.swing.JComponent
 import javax.swing.JPanel

diff --git a/...conan/clion/dialogs/ConanInstallDialog.kt → ...onan/plugin/dialogs/ConanInstallDialog.kt b/...conan/clion/dialogs/ConanInstallDialog.kt → ...onan/plugin/dialogs/ConanInstallDialog.kt
@@ -1,12 +1,12 @@
-package com.jfrog.conan.clion.dialogs
+package com.jfrog.conan.plugin.dialogs
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.components.JBCheckBox
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.cmake.CMake
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.cmake.CMake
 import java.awt.Font
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout

diff --git a/...com/jfrog/conan/clion/icons/ConanIcons.kt → ...om/jfrog/conan/plugin/icons/ConanIcons.kt b/...com/jfrog/conan/clion/icons/ConanIcons.kt → ...om/jfrog/conan/plugin/icons/ConanIcons.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.icons
+package com.jfrog.conan.plugin.icons
 
 import com.intellij.openapi.util.IconLoader
 

diff --git a/...n/listeners/ConanCMakeSettingsListener.kt → ...n/listeners/ConanCMakeSettingsListener.kt b/...n/listeners/ConanCMakeSettingsListener.kt → ...n/listeners/ConanCMakeSettingsListener.kt
@@ -1,12 +1,12 @@
-package com.jfrog.conan.clion.listeners
+package com.jfrog.conan.plugin.listeners
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.jetbrains.cidr.cpp.cmake.CMakeSettings
 import com.jetbrains.cidr.cpp.cmake.CMakeSettingsListener
-import com.jfrog.conan.clion.cmake.CMake
-import com.jfrog.conan.clion.models.PersistentStorageKeys
+import com.jfrog.conan.plugin.cmake.CMake
+import com.jfrog.conan.plugin.models.PersistentStorageKeys
 
 
 internal class ConanCMakeSettingsListener(private val project: Project) : CMakeSettingsListener {

diff --git a/...com/jfrog/conan/clion/models/Component.kt → ...om/jfrog/conan/plugin/models/Component.kt b/...com/jfrog/conan/clion/models/Component.kt → ...om/jfrog/conan/plugin/models/Component.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.models
+package com.jfrog.conan.plugin.models
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/...conan/clion/models/LibrariesTableModel.kt → ...onan/plugin/models/LibrariesTableModel.kt b/...conan/clion/models/LibrariesTableModel.kt → ...onan/plugin/models/LibrariesTableModel.kt
@@ -1,6 +1,6 @@
-package com.jfrog.conan.clion.models
+package com.jfrog.conan.plugin.models
 
-import com.jfrog.conan.clion.bundles.UIBundle
+import com.jfrog.conan.plugin.bundles.UIBundle
 import javax.swing.table.DefaultTableModel
 
 class LibrariesTableModel(rowCount: Int) : DefaultTableModel(arrayOf(UIBundle.message("libraries.list.table.name")), rowCount) {

diff --git a/...n/com/jfrog/conan/clion/models/Library.kt → .../com/jfrog/conan/plugin/models/Library.kt b/...n/com/jfrog/conan/clion/models/Library.kt → .../com/jfrog/conan/plugin/models/Library.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.models
+package com.jfrog.conan.plugin.models
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/...m/jfrog/conan/clion/models/LibraryData.kt → .../jfrog/conan/plugin/models/LibraryData.kt b/...m/jfrog/conan/clion/models/LibraryData.kt → .../jfrog/conan/plugin/models/LibraryData.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.models
+package com.jfrog.conan.plugin.models
 
 import kotlinx.serialization.Serializable
 

diff --git a/...nan/clion/models/PersistentStorageKeys.kt → ...an/plugin/models/PersistentStorageKeys.kt b/...nan/clion/models/PersistentStorageKeys.kt → ...an/plugin/models/PersistentStorageKeys.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.models
+package com.jfrog.conan.plugin.models
 
 class PersistentStorageKeys {
     companion object {

diff --git a/...frog/conan/clion/services/ConanService.kt → ...rog/conan/plugin/services/ConanService.kt b/...frog/conan/clion/services/ConanService.kt → ...rog/conan/plugin/services/ConanService.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.services
+package com.jfrog.conan.plugin.services
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.components.Service
@@ -8,11 +8,11 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.jetbrains.cidr.cpp.cmake.workspace.CMakeWorkspace
-import com.jfrog.conan.clion.cmake.CMake
-import com.jfrog.conan.clion.conan.ConanPluginUtils
-import com.jfrog.conan.clion.conan.extensions.downloadFromUrl
-import com.jfrog.conan.clion.models.LibraryData
-import com.jfrog.conan.clion.models.PersistentStorageKeys
+import com.jfrog.conan.plugin.cmake.CMake
+import com.jfrog.conan.plugin.conan.ConanPluginUtils
+import com.jfrog.conan.plugin.conan.extensions.downloadFromUrl
+import com.jfrog.conan.plugin.models.LibraryData
+import com.jfrog.conan.plugin.models.PersistentStorageKeys
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json

diff --git a/...an/clion/toolWindow/ConanWindowFactory.kt → ...n/plugin/toolWindow/ConanWindowFactory.kt b/...an/clion/toolWindow/ConanWindowFactory.kt → ...n/plugin/toolWindow/ConanWindowFactory.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.toolWindow
+package com.jfrog.conan.plugin.toolWindow
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
@@ -15,10 +15,10 @@ import com.intellij.ui.content.ContentFactory
 import com.intellij.ui.table.JBTable
 import com.intellij.util.text.SemVer
 import com.intellij.util.ui.JBUI
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.conan.datamodels.Recipe
-import com.jfrog.conan.clion.models.LibrariesTableModel
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.conan.datamodels.Recipe
+import com.jfrog.conan.plugin.models.LibrariesTableModel
+import com.jfrog.conan.plugin.services.ConanService
 import java.awt.BorderLayout
 import javax.swing.*
 import javax.swing.event.DocumentEvent

diff --git a/...nan/clion/toolWindow/MainActionToolbar.kt → ...an/plugin/toolWindow/MainActionToolbar.kt b/...nan/clion/toolWindow/MainActionToolbar.kt → ...an/plugin/toolWindow/MainActionToolbar.kt
@@ -1,14 +1,14 @@
-package com.jfrog.conan.clion.toolWindow
+package com.jfrog.conan.plugin.toolWindow
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.jfrog.conan.clion.cmake.CMake
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.dialogs.ConanExecutableDialogWrapper
-import com.jfrog.conan.clion.dialogs.ConanInspectPackagesDialogWrapper
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.cmake.CMake
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.dialogs.ConanExecutableDialogWrapper
+import com.jfrog.conan.plugin.dialogs.ConanInspectPackagesDialogWrapper
+import com.jfrog.conan.plugin.services.ConanService
 
 class MainActionToolbar(val project: Project) {
     private val conanService = project.service<ConanService>()

diff --git a/...ion/toolWindow/PackageInformationPanel.kt → ...gin/toolWindow/PackageInformationPanel.kt b/...ion/toolWindow/PackageInformationPanel.kt → ...gin/toolWindow/PackageInformationPanel.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion.toolWindow
+package com.jfrog.conan.plugin.toolWindow
 
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
@@ -8,8 +8,8 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBPanelWithEmptyText
 import com.intellij.ui.components.JBScrollPane
-import com.jfrog.conan.clion.bundles.UIBundle
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.bundles.UIBundle
+import com.jfrog.conan.plugin.services.ConanService
 import java.awt.Component
 import java.awt.FlowLayout
 import java.awt.GridBagConstraints
@@ -76,7 +76,7 @@ class PackageInformationPanel(private val project: Project) : JBPanelWithEmptyTe
 
 
                 NotificationGroupManager.getInstance()
-                    .getNotificationGroup("com.jfrog.conan.clion.notifications.general")
+                    .getNotificationGroup("com.jfrog.conan.plugin.notifications.general")
                     .createNotification(
                         UIBundle.message("library.added.title", "$name/$selectedVersion"),
                         UIBundle.message("library.added.body"),
@@ -95,7 +95,7 @@ class PackageInformationPanel(private val project: Project) : JBPanelWithEmptyTe
                 comboBox.setToolTipText(null)
 
                 NotificationGroupManager.getInstance()
-                    .getNotificationGroup("com.jfrog.conan.clion.notifications.general")
+                    .getNotificationGroup("com.jfrog.conan.plugin.notifications.general")
                     .createNotification(
                         UIBundle.message("library.removed.title"),
                         UIBundle.message("library.removed.body", "$name/$selectedVersion"),

diff --git a/...rog/conan/clion/toolWindow/ReadmePanel.kt → ...og/conan/plugin/toolWindow/ReadmePanel.kt b/...rog/conan/clion/toolWindow/ReadmePanel.kt → ...og/conan/plugin/toolWindow/ReadmePanel.kt
@@ -1,11 +1,11 @@
-package com.jfrog.conan.clion.toolWindow
+package com.jfrog.conan.plugin.toolWindow
 
 import com.intellij.ide.ui.LafManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.jcef.JCEFHtmlPanel
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.services.ConanService
 import java.awt.Color
 import javax.swing.JComponent
 import javax.swing.SwingUtilities

diff --git a/...nan/clion/toolWindow/UsedPackagesPanel.kt → ...an/plugin/toolWindow/UsedPackagesPanel.kt b/...nan/clion/toolWindow/UsedPackagesPanel.kt → ...an/plugin/toolWindow/UsedPackagesPanel.kt
@@ -1,11 +1,11 @@
-package com.jfrog.conan.clion.toolWindow
+package com.jfrog.conan.plugin.toolWindow
 
 import com.intellij.ide.ui.LafManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.ui.jcef.JCEFHtmlPanel
-import com.jfrog.conan.clion.models.LibraryData
-import com.jfrog.conan.clion.services.ConanService
+import com.jfrog.conan.plugin.models.LibraryData
+import com.jfrog.conan.plugin.services.ConanService
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.awt.Color

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
 <idea-plugin>
-    <id>com.jfrog.conan.clion</id>
+    <id>com.jfrog.conan.plugin</id>
     <name>Conan</name>
     <vendor>JFrog</vendor>
     <description><![CDATA[
@@ -21,18 +21,18 @@
     <depends>com.intellij.modules.clion</depends>
     <resource-bundle>messages.ui</resource-bundle>
     <extensions defaultExtensionNs="com.intellij">
-        <toolWindow factoryClass="com.jfrog.conan.clion.toolWindow.ConanWindowFactory"
+        <toolWindow factoryClass="com.jfrog.conan.plugin.toolWindow.ConanWindowFactory"
                     id="Conan"
                     anchor="bottom"
-                    icon="com.jfrog.conan.clion.icons.ConanIcons.Logo"/>
+                    icon="com.jfrog.conan.plugin.icons.ConanIcons.Logo"/>
 
-        <notificationGroup id="com.jfrog.conan.clion.notifications.general"
+        <notificationGroup id="com.jfrog.conan.plugin.notifications.general"
                            displayType="BALLOON"
                            key="generalNotificationKey"/>
     </extensions>
 
     <projectListeners>
-        <listener class="com.jfrog.conan.clion.listeners.ConanCMakeSettingsListener"
+        <listener class="com.jfrog.conan.plugin.listeners.ConanCMakeSettingsListener"
                   topic="com.jetbrains.cidr.cpp.cmake.CMakeSettingsListener"/>
     </projectListeners>
 </idea-plugin>
diff --git a/src/main/resources/messages/ui.properties b/src/main/resources/messages/ui.properties
@@ -1,4 +1,4 @@
-generalNotificationKey=com.jfrog.conan.clion.notifications.general.key
+generalNotificationKey=com.jfrog.conan.plugin.notifications.general.key
 
 config.title=Configuration
 config.executable=Conan executable

diff --git a/src/test/kotlin/com/jfrog/conan/clionplugin/MyPluginTest.kt b/src/test/kotlin/com/jfrog/conan/clionplugin/MyPluginTest.kt
@@ -1,4 +1,4 @@
-package com.jfrog.conan.clion
+package com.jfrog.conan.plugin
 
 import com.intellij.ide.highlighter.XmlFileType
 import com.intellij.psi.xml.XmlFile