Merge branch 'master' into upgrade

build.gradle

@@ -6,7 +6,7 @@ plugins {
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'idea'
 
-group 'org.tboox.xmake'
+group 'io.xmake'
 version '1.0.6'
 
 repositories {
@@ -23,12 +23,13 @@ dependencies {
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
+/*
 intellij {
     type 'CL'
     version = 'CL-2021.1.2'
     downloadSources false
     plugins = ["com.intellij.cidr.base", "com.intellij.clion"]
-}
+}*/
 
 test {
     useJUnitPlatform()

src/main/kotlin/org/tboox/xmake/actions/BuildAction.kt → src/main/kotlin/io/xmake/actions/BuildAction.kt

@@ -1,12 +1,12 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 
 class BuildAction : AnAction() {

src/main/kotlin/org/tboox/xmake/actions/CleanAction.kt → src/main/kotlin/io/xmake/actions/CleanAction.kt

@@ -1,12 +1,12 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 class CleanAction : AnAction() {
 

src/main/kotlin/org/tboox/xmake/actions/CleanConfigurationAction.kt → src/main/kotlin/io/xmake/actions/CleanConfigurationAction.kt

@@ -1,10 +1,10 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 class CleanConfigurationAction : AnAction() {
 

src/main/kotlin/org/tboox/xmake/actions/QuickStartAction.kt → src/main/kotlin/io/xmake/actions/QuickStartAction.kt

@@ -1,10 +1,10 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 class QuickStartAction : AnAction() {
 

src/main/kotlin/org/tboox/xmake/actions/RebuildAction.kt → src/main/kotlin/io/xmake/actions/RebuildAction.kt

@@ -1,12 +1,12 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 class RebuildAction : AnAction() {
 

src/main/kotlin/org/tboox/xmake/actions/RunAction.kt → src/main/kotlin/io/xmake/actions/RunAction.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.actions
+package io.xmake.actions
 
 import com.intellij.execution.RunManager
 import com.intellij.execution.process.ProcessAdapter
@@ -6,10 +6,10 @@ import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.run.XMakeRunConfiguration
-import org.tboox.xmake.utils.SystemUtils
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.project.xmakeConsoleView
+import io.xmake.run.XMakeRunConfiguration
+import io.xmake.utils.SystemUtils
+import io.xmake.shared.xmakeConfiguration
 
 class RunAction : AnAction() {
 

src/main/kotlin/org/tboox/xmake/icons/XMakeIconProvider.kt → src/main/kotlin/io/xmake/icons/XMakeIconProvider.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.icons
+package io.xmake.icons
 
 import com.intellij.ide.IconProvider
 import com.intellij.psi.PsiElement

src/main/kotlin/org/tboox/xmake/icons/XMakeIcons.kt → src/main/kotlin/io/xmake/icons/XMakeIcons.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.icons
+package io.xmake.icons
 
 import com.intellij.openapi.util.IconLoader
 import javax.swing.Icon

src/main/kotlin/org/tboox/xmake/project/XMakeConfigData.kt → src/main/kotlin/io/xmake/project/XMakeConfigData.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 data class XMakeConfigData(
     val languagesModel: String,

src/main/kotlin/org/tboox/xmake/project/XMakeDirectoryProjectGenerator.kt → src/main/kotlin/io/xmake/project/XMakeDirectoryProjectGenerator.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.facet.ui.ValidationResult
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep
@@ -10,8 +10,8 @@ import com.intellij.openapi.wm.impl.welcomeScreen.AbstractActionWithPanel
 import com.intellij.platform.DirectoryProjectGenerator
 import com.intellij.platform.DirectoryProjectGeneratorBase
 import com.intellij.platform.ProjectGeneratorPeer
-import org.tboox.xmake.icons.XMakeIcons
-import org.tboox.xmake.utils.SystemUtils
+import io.xmake.icons.XMakeIcons
+import io.xmake.utils.SystemUtils
 import java.io.File
 import javax.swing.Icon
 

src/main/kotlin/org/tboox/xmake/project/XMakeModuleBuilder.kt → src/main/kotlin/io/xmake/project/XMakeModuleBuilder.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import XMakeSdkSettingsStep
 import com.intellij.ide.util.projectWizard.*
@@ -10,7 +10,7 @@ import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.LocalFileSystem
-import org.tboox.xmake.utils.SystemUtils
+import io.xmake.utils.SystemUtils
 
 
 class XMakeModuleBuilder : ModuleBuilder() {

src/main/kotlin/org/tboox/xmake/project/XMakeModuleConfigurationEditorProvider.kt → src/main/kotlin/io/xmake/project/XMakeModuleConfigurationEditorProvider.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.module.ModuleConfigurationEditor

src/main/kotlin/org/tboox/xmake/project/XMakeModuleType.kt → src/main/kotlin/io/xmake/project/XMakeModuleType.kt

@@ -1,9 +1,9 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.module.ModuleType
 import com.intellij.openapi.module.ModuleTypeManager
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-import org.tboox.xmake.icons.XMakeIcons
+import io.xmake.icons.XMakeIcons
 
 import javax.swing.*
 

src/main/kotlin/org/tboox/xmake/project/XMakeNewProjectPanel.kt → src/main/kotlin/io/xmake/project/XMakeNewProjectPanel.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.ProjectManager

src/main/kotlin/org/tboox/xmake/project/XMakeProjectConfigurable.kt → src/main/kotlin/io/xmake/project/XMakeProjectConfigurable.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.execution.ExecutionBundle
 import com.intellij.openapi.diagnostic.Logger
@@ -15,8 +15,8 @@ import com.intellij.ui.components.Label
 import com.intellij.ui.layout.LayoutBuilder
 import com.intellij.ui.layout.Row
 import com.intellij.ui.layout.panel
-import org.tboox.xmake.shared.XMakeConfiguration
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.shared.XMakeConfiguration
+import io.xmake.shared.xmakeConfiguration
 import java.awt.Dimension
 import javax.swing.JComponent
 import javax.swing.JPanel
@@ -106,7 +106,6 @@ class XMakeProjectConfigurable(
 
         labeledRow("Additional configuration:", additionalConfiguration) {
             additionalConfiguration.apply {
-                dialogCaption = "Additional configuration"
                 makeWide()
             }()
         }

src/main/kotlin/org/tboox/xmake/project/XMakeProjectGeneratorPeer.kt → src/main/kotlin/io/xmake/project/XMakeProjectGeneratorPeer.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.platform.GeneratorPeerImpl

src/main/kotlin/org/tboox/xmake/project/XMakeProjectSettingsStep.kt → src/main/kotlin/io/xmake/project/XMakeProjectSettingsStep.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep
 import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase
 import com.intellij.platform.DirectoryProjectGenerator

src/main/kotlin/org/tboox/xmake/project/XMakeSdkSettingsStep.kt → src/main/kotlin/io/xmake/project/XMakeSdkSettingsStep.kt

@@ -6,8 +6,8 @@ import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.ui.layout.panel
 import javax.swing.JComponent
 import com.intellij.openapi.util.Disposer
-import org.tboox.xmake.project.XMakeModuleBuilder
-import org.tboox.xmake.project.XMakeNewProjectPanel
+import io.xmake.project.XMakeModuleBuilder
+import io.xmake.project.XMakeNewProjectPanel
 
 
 class XMakeSdkSettingsStep(

src/main/kotlin/org/tboox/xmake/project/XMakeSdkType.kt → src/main/kotlin/io/xmake/project/XMakeSdkType.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.projectRoots.SdkType
@@ -7,9 +7,9 @@ import com.intellij.openapi.projectRoots.SdkModificator
 import com.intellij.openapi.projectRoots.SdkModel
 import com.intellij.openapi.projectRoots.AdditionalDataConfigurable
 import com.intellij.openapi.projectRoots.Sdk
-import org.tboox.xmake.icons.XMakeIcons
+import io.xmake.icons.XMakeIcons
 import org.jdom.Element
-import org.tboox.xmake.utils.SystemUtils
+import io.xmake.utils.SystemUtils
 import javax.swing.Icon
 
 class XMakeSdkType : SdkType("XMake SDK") {

src/main/kotlin/org/tboox/xmake/project/XMakeToolWindowFactory.kt → src/main/kotlin/io/xmake/project/XMakeToolWindowFactory.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.execution.ui.ConsoleView
 import com.intellij.openapi.project.Project
@@ -6,7 +6,7 @@ import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.ui.content.ContentFactory
-import org.tboox.xmake.shared.XMakeProblem
+import io.xmake.shared.XMakeProblem
 
 class XMakeToolWindowFactory : ToolWindowFactory {
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {

src/main/kotlin/org/tboox/xmake/project/XMakeToolWindowOutputPanel.kt → src/main/kotlin/io/xmake/project/XMakeToolWindowOutputPanel.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.execution.filters.TextConsoleBuilderFactory
 import com.intellij.execution.ui.ConsoleView

src/main/kotlin/org/tboox/xmake/project/XMakeToolWindowProblemPanel.kt → src/main/kotlin/io/xmake/project/XMakeToolWindowProblemPanel.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.project
+package io.xmake.project
 
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionToolbar
@@ -13,8 +13,8 @@ import com.intellij.ui.SimpleTextAttributes
 import com.intellij.ui.components.JBList
 import com.intellij.ui.layout.CCFlags
 import com.intellij.ui.layout.panel
-import org.tboox.xmake.icons.XMakeIcons
-import org.tboox.xmake.shared.XMakeProblem
+import io.xmake.icons.XMakeIcons
+import io.xmake.shared.XMakeProblem
 import java.awt.Font
 import java.awt.event.MouseEvent
 import java.awt.event.MouseAdapter
@@ -24,7 +24,7 @@ import java.io.File
 import javax.swing.ListSelectionModel
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.vfs.LocalFileSystem
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.shared.xmakeConfiguration
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.TextAttributes

src/main/kotlin/org/tboox/xmake/run/XMakeRunConfiguration.kt → src/main/kotlin/io/xmake/run/XMakeRunConfiguration.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run
+package io.xmake.run
 
 import com.intellij.execution.Executor
 import com.intellij.execution.configuration.EnvironmentVariablesData
@@ -10,9 +10,9 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
 import org.jdom.Element
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.shared.xmakeConfiguration
-import org.tboox.xmake.utils.SystemUtils
+import io.xmake.project.xmakeConsoleView
+import io.xmake.shared.xmakeConfiguration
+import io.xmake.utils.SystemUtils
 
 class XMakeRunConfiguration(
     project: Project, name: String, factory: ConfigurationFactory

src/main/kotlin/org/tboox/xmake/run/XMakeRunConfigurationEditor.kt → src/main/kotlin/io/xmake/run/XMakeRunConfigurationEditor.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run
+package io.xmake.run
 
 import com.intellij.execution.configuration.EnvironmentVariablesComponent
 import com.intellij.openapi.diagnostic.Logger
@@ -8,7 +8,7 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.RawCommandLineEditor
 import com.intellij.ui.layout.*
 import com.intellij.ui.components.Label
-import org.tboox.xmake.shared.xmakeConfiguration
+import io.xmake.shared.xmakeConfiguration
 import java.awt.Dimension
 import javax.swing.JComponent
 import javax.swing.JPanel
@@ -63,7 +63,6 @@ class XMakeRunConfigurationEditor(private val project: Project) : SettingsEditor
 
         labeledRow("Run arguments:", runArguments) {
             runArguments.apply {
-                dialogCaption = "Run arguments"
                 makeWide()
             }()
         }

src/main/kotlin/org/tboox/xmake/run/XMakeRunConfigurationProducer.kt → src/main/kotlin/io/xmake/run/XMakeRunConfigurationProducer.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run
+package io.xmake.run
 
 import com.intellij.execution.actions.ConfigurationContext
 import com.intellij.execution.actions.RunConfigurationProducer

src/main/kotlin/org/tboox/xmake/run/XMakeRunConfigurationType.kt → src/main/kotlin/io/xmake/run/XMakeRunConfigurationType.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run
+package io.xmake.run
 
 import com.intellij.execution.BeforeRunTask
 import com.intellij.execution.configurations.ConfigurationFactory
@@ -7,7 +7,7 @@ import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
-import org.tboox.xmake.icons.XMakeIcons
+import io.xmake.icons.XMakeIcons
 
 class XMakeRunConfigurationType : ConfigurationTypeBase(
     "XMakeRunConfiguration",

src/main/kotlin/org/tboox/xmake/run/XMakeRunner.kt → src/main/kotlin/io/xmake/run/XMakeRunner.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.run
+package io.xmake.run
 
 import com.intellij.execution.configurations.RunProfile
 import com.intellij.execution.executors.DefaultRunExecutor

src/main/kotlin/org/tboox/xmake/shared/XMakeConfiguration.kt → src/main/kotlin/io/xmake/shared/XMakeConfiguration.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.shared
+package io.xmake.shared
 
 import com.intellij.execution.configuration.EnvironmentVariablesData
 import com.intellij.execution.configurations.GeneralCommandLine
@@ -7,7 +7,7 @@ import com.intellij.openapi.components.State
 import com.intellij.openapi.components.ProjectComponent
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import org.tboox.xmake.utils.SystemUtils
+import io.xmake.utils.SystemUtils
 
 @State(name = "XMakeProjectSettings")
 class XMakeConfiguration(// the project

src/main/kotlin/org/tboox/xmake/shared/XMakeProblem.kt → src/main/kotlin/io/xmake/shared/XMakeProblem.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.shared
+package io.xmake.shared
 
 class XMakeProblem (val file: String? = null, val line: String? = "0", val column: String? = "0", val kind: String? = "error", val message: String? = "") {
 }

src/main/kotlin/org/tboox/xmake/utils/ConsoleProcessHandler.kt → src/main/kotlin/io/xmake/utils/ConsoleProcessHandler.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.utils
+package io.xmake.utils
 
 import com.intellij.execution.process.*
 import com.intellij.execution.ui.ConsoleView

src/main/kotlin/org/tboox/xmake/utils/SystemUtils.kt → src/main/kotlin/io/xmake/utils/SystemUtils.kt

@@ -1,4 +1,4 @@
-package org.tboox.xmake.utils
+package io.xmake.utils
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.ProcessAdapter
@@ -8,11 +8,11 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import org.tboox.xmake.project.xmakeConsoleView
-import org.tboox.xmake.project.xmakeOutputPanel
-import org.tboox.xmake.project.xmakeProblemList
-import org.tboox.xmake.project.xmakeToolWindow
-import org.tboox.xmake.shared.XMakeProblem
+import io.xmake.project.xmakeConsoleView
+import io.xmake.project.xmakeOutputPanel
+import io.xmake.project.xmakeProblemList
+import io.xmake.project.xmakeToolWindow
+import io.xmake.shared.XMakeProblem
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader

src/main/resources/META-INF/plugin.xml

@@ -1,9 +1,9 @@
 <!-- plugin-docs: https://www.jetbrains.org/intellij/sdk/docs/basics.html -->
 <idea-plugin>
-    <id>org.tboox.xmake</id>
+    <id>io.xmake</id>
     <name>XMake</name>
-    <version>1.0.5</version>
-    <vendor email="[email protected]" url="http://www.tboox.org">tboox.org</vendor>
+    <version>1.0.6</version>
+    <vendor email="[email protected]" url="https://xmake.io">xmake.io</vendor>
 
     <description><![CDATA[
     A XMake integration plugin in Intellij Platform<br>
@@ -30,6 +30,10 @@
     ]]></description>
 
     <change-notes><![CDATA[
+    <strong>1.0.6</strong>
+    <ul>
+        <li>[NEW]: Support latest CLion and IDEA Intellij</li>
+    </ul>
     <strong>1.0.5</strong>
     <ul>
         <li>[FIX]: Fix conflict issues with java</li>
@@ -72,26 +76,26 @@
     <extensions defaultExtensionNs="com.intellij">
 
         <!-- icons -->
-        <iconProvider implementation="org.tboox.xmake.icons.XMakeIconProvider"/>
+        <iconProvider implementation="io.xmake.icons.XMakeIconProvider"/>
 
         <!-- module configurations -->
         <!-- clion not support -->
-        <sdkType implementation="org.tboox.xmake.project.XMakeSdkType"/>
-        <moduleType id="XMake.Module" implementationClass="org.tboox.xmake.project.XMakeModuleType"/>
-        <moduleBuilder builderClass="org.tboox.xmake.project.XMakeModuleBuilder"/>
+        <sdkType implementation="io.xmake.project.XMakeSdkType"/>
+        <moduleType id="XMake.Module" implementationClass="io.xmake.project.XMakeModuleType"/>
+        <moduleBuilder builderClass="io.xmake.project.XMakeModuleBuilder"/>
 
-        <directoryProjectGenerator implementation="org.tboox.xmake.project.XMakeDirectoryProjectGenerator"/>
+        <directoryProjectGenerator implementation="io.xmake.project.XMakeDirectoryProjectGenerator"/>
 
         <!-- project configurations -->
-        <projectConfigurable instance="org.tboox.xmake.project.XMakeProjectConfigurable" displayName="XMake"
+        <projectConfigurable instance="io.xmake.project.XMakeProjectConfigurable" displayName="XMake"
                              groupId="language"/>
-        <toolWindow id="XMake" anchor="bottom" factoryClass="org.tboox.xmake.project.XMakeToolWindowFactory"
+        <toolWindow id="XMake" anchor="bottom" factoryClass="io.xmake.project.XMakeToolWindowFactory"
                     icon="/icons/xmake_13x13.png"/>
 
         <!-- run configurations -->
-        <programRunner implementation="org.tboox.xmake.run.XMakeRunner"/>
-        <configurationType implementation="org.tboox.xmake.run.XMakeRunConfigurationType"/>
-        <runConfigurationProducer implementation="org.tboox.xmake.run.XMakeRunConfigurationProducer"/>
+        <programRunner implementation="io.xmake.run.XMakeRunner"/>
+        <configurationType implementation="io.xmake.run.XMakeRunConfigurationType"/>
+        <runConfigurationProducer implementation="io.xmake.run.XMakeRunConfigurationProducer"/>
 
     </extensions>
 
@@ -103,28 +107,28 @@
     <actions>
         <group id="XMake.Menu" text="XMake" description="XMake Menu">
             <add-to-group group-id="MainMenu" anchor="after" relative-to-action="RunMenu"/>
-            <action id="XMake.Run" class="org.tboox.xmake.actions.RunAction" text="Run Target" icon="/icons/run.png"
+            <action id="XMake.Run" class="io.xmake.actions.RunAction" text="Run Target" icon="/icons/run.png"
                     description="Run the current target."/>
-            <action id="XMake.Build" class="org.tboox.xmake.actions.BuildAction" text="Build Project"
+            <action id="XMake.Build" class="io.xmake.actions.BuildAction" text="Build Project"
                     icon="/icons/build.png" description="Build the current project."/>
-            <action id="XMake.Rebuild" class="org.tboox.xmake.actions.RebuildAction" text="Rebuild Project"
+            <action id="XMake.Rebuild" class="io.xmake.actions.RebuildAction" text="Rebuild Project"
                     icon="/icons/rebuild.png" description="Rebuild the current project."/>
-            <action id="XMake.Clean" class="org.tboox.xmake.actions.CleanAction" text="Clean Project"
+            <action id="XMake.Clean" class="io.xmake.actions.CleanAction" text="Clean Project"
                     icon="/icons/clean.png" description="Clean target and object files."/>
             <separator/>
             <reference id="editRunConfigurations"/>
-            <action id="XMake.CleanConfiguration" class="org.tboox.xmake.actions.CleanConfigurationAction"
+            <action id="XMake.CleanConfiguration" class="io.xmake.actions.CleanConfigurationAction"
                     text="Clean Configuration" icon="/icons/cleanconf.png"
                     description="Clean the current configuration."/>
             <separator/>
-            <action id="XMake.QuickStart" class="org.tboox.xmake.actions.QuickStartAction" text="Quick Start"
+            <action id="XMake.QuickStart" class="io.xmake.actions.QuickStartAction" text="Quick Start"
                     icon="/icons/quickstart.png" description="Quick start a new project."/>
         </group>
     </actions>
 
     <project-components>
         <component>
-            <implementation-class>org.tboox.xmake.shared.XMakeConfiguration</implementation-class>
+            <implementation-class>io.xmake.shared.XMakeConfiguration</implementation-class>
         </component>
     </project-components>
 </idea-plugin>