diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a508772..e89896f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/manually-release.yml b/.github/workflows/manually-release.yml index d7dee3d..96c2f26 100644 --- a/.github/workflows/manually-release.yml +++ b/.github/workflows/manually-release.yml @@ -26,11 +26,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 519f7fd..9ad35cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/plugin-slack/build.gradle b/build.gradle similarity index 73% rename from plugin-slack/build.gradle rename to build.gradle index 6b929b4..46a2370 100644 --- a/plugin-slack/build.gradle +++ b/build.gradle @@ -1,20 +1,16 @@ -import com.github.spotbugs.SpotBugsTask - plugins { - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id "io.spring.dependency-management" version "1.1.4" id 'java' id 'jacoco' - id "com.github.spotbugs" version "3.0.0" id "com.github.node-gradle.node" version "2.2.1" } - node { version = '20.11.0' npmVersion = '10.2.4' download = true - workDir = file("${project.buildDir}/plugin-slack/ui") - nodeModulesDir = file("${project.rootDir}/plugin-slack/ui") + workDir = file("${project.buildDir}/ui") + nodeModulesDir = file("${project.rootDir}/ui") } npm_run_build { @@ -48,29 +44,19 @@ dependencies { implementation 'com.epam.reportportal:plugin-api' annotationProcessor 'com.epam.reportportal:plugin-api' } else { - implementation 'com.github.reportportal:commons-dao:acf1ec7' - implementation 'com.github.reportportal:plugin-api:188792e' - annotationProcessor 'com.github.reportportal:plugin-api:188792e' + implementation 'com.github.reportportal:commons-dao:a98c172' + implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT' + annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT' } - compile("com.slack.api:slack-api-client:1.27.1") { + implementation("com.slack.api:slack-api-client:1.27.1") { exclude group: "org.slf4j" } - compile 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' implementation 'org.hibernate:hibernate-core:5.6.15.Final' } -spotbugs { - sourceSets = [sourceSets.main] - reportLevel = "high" -} -tasks.withType(SpotBugsTask) { - reports { - xml.enabled false - html.enabled true - } -} - test { useJUnitPlatform() maxParallelForks = 1 @@ -79,7 +65,7 @@ test { exceptionFormat = 'short' } reports { - junitXml.enabled = true + junitXml.required = true } } @@ -109,7 +95,7 @@ jar { } manifest { attributes( - "Class-Path": configurations.compile.collect { it.getName() }.join(' '), + "Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '), "Plugin-Id": "${pluginId}", "Plugin-Version": "${project.version}", "Plugin-Provider": "Report Portal", @@ -126,7 +112,7 @@ shadowJar { from("ui/build") { into("/resources") } - configurations = [project.configurations.compile] + configurations = [project.configurations.compileClasspath] zip64 true dependencies { } @@ -138,9 +124,9 @@ task plugin(type: Jar) { with jar } into('lib') { - from configurations.compile + from configurations.compileClasspath } - extension('zip') + archiveExtension.set('zip') } task assemblePlugin(type: Copy) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..afba109 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2b..5c40527 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugin-slack/gradle.properties b/plugin-slack/gradle.properties deleted file mode 100644 index f8b6aba..0000000 --- a/plugin-slack/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -version=1.0.1 -description=EPAM Report Portal. Slack plugin. -pluginId = slack diff --git a/plugin-slack/project-properties.gradle b/plugin-slack/project-properties.gradle deleted file mode 100644 index b9a5220..0000000 --- a/plugin-slack/project-properties.gradle +++ /dev/null @@ -1,24 +0,0 @@ -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 - -def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' - -project.ext { - publishRepo = "https://maven.pkg.github.com/reportportal/plugin-slack" - releaseMode = project.hasProperty("releaseMode") - pluginsDir = "$buildDir/plugins" - scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop') - excludeTests = [ - '**/entity/**', - '**/model/**', - ] - limits = [ - 'instruction': 30, - 'branch' : 17, - 'line' : 30, - 'complexity' : 26, - 'method' : 29, - 'class' : 30 - ] -} - diff --git a/project-properties.gradle b/project-properties.gradle index d47c492..a743a9c 100644 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -1,12 +1,31 @@ -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' project.ext { + publishRepo = "https://maven.pkg.github.com/reportportal/plugin-slack" releaseMode = project.hasProperty("releaseMode") - pluginsDir = "$buildDir/jars" - + pluginsDir = "$buildDir/plugins" + scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop') + excludeTests = [ + '**/entity/**', + '**/model/**', + ] + limits = [ + 'instruction': 30, + 'branch' : 17, + 'line' : 30, + 'complexity' : 26, + 'method' : 29, + 'class' : 30 + ] } wrapper { - gradleVersion = '5.4.1' + gradleVersion = '8.10.2' } + + diff --git a/settings.gradle b/settings.gradle index 132da54..330116d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ -rootProject.name = 'plugin-slack-epam' -include 'plugin-slack' +rootProject.name = 'plugin-slack' diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/SlackPlugin.java b/src/main/java/com/epam/reportportal/extension/slack/SlackPlugin.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/SlackPlugin.java rename to src/main/java/com/epam/reportportal/extension/slack/SlackPlugin.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/SlackPluginExtension.java b/src/main/java/com/epam/reportportal/extension/slack/SlackPluginExtension.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/SlackPluginExtension.java rename to src/main/java/com/epam/reportportal/extension/slack/SlackPluginExtension.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/binary/JsonObjectLoader.java b/src/main/java/com/epam/reportportal/extension/slack/binary/JsonObjectLoader.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/binary/JsonObjectLoader.java rename to src/main/java/com/epam/reportportal/extension/slack/binary/JsonObjectLoader.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/binary/MessageTemplateStore.java b/src/main/java/com/epam/reportportal/extension/slack/binary/MessageTemplateStore.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/binary/MessageTemplateStore.java rename to src/main/java/com/epam/reportportal/extension/slack/binary/MessageTemplateStore.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/PropertyCollector.java b/src/main/java/com/epam/reportportal/extension/slack/collector/PropertyCollector.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/PropertyCollector.java rename to src/main/java/com/epam/reportportal/extension/slack/collector/PropertyCollector.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/AttributesCollector.java b/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/AttributesCollector.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/AttributesCollector.java rename to src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/AttributesCollector.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/LaunchPropertiesCollector.java b/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/LaunchPropertiesCollector.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/LaunchPropertiesCollector.java rename to src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/LaunchPropertiesCollector.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/ResultColorCollector.java b/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/ResultColorCollector.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/ResultColorCollector.java rename to src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/ResultColorCollector.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/StatisticsPropertiesCollector.java b/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/StatisticsPropertiesCollector.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/StatisticsPropertiesCollector.java rename to src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/StatisticsPropertiesCollector.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/EventHandlerFactory.java b/src/main/java/com/epam/reportportal/extension/slack/event/EventHandlerFactory.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/EventHandlerFactory.java rename to src/main/java/com/epam/reportportal/extension/slack/event/EventHandlerFactory.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/handler/EventHandler.java b/src/main/java/com/epam/reportportal/extension/slack/event/handler/EventHandler.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/handler/EventHandler.java rename to src/main/java/com/epam/reportportal/extension/slack/event/handler/EventHandler.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/handler/plugin/PluginLoadedEventHandler.java b/src/main/java/com/epam/reportportal/extension/slack/event/handler/plugin/PluginLoadedEventHandler.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/handler/plugin/PluginLoadedEventHandler.java rename to src/main/java/com/epam/reportportal/extension/slack/event/handler/plugin/PluginLoadedEventHandler.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListener.java b/src/main/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListener.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListener.java rename to src/main/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListener.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/AttachmentResolver.java b/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/AttachmentResolver.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/AttachmentResolver.java rename to src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/AttachmentResolver.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/SenderCaseMatcher.java b/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/SenderCaseMatcher.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/SenderCaseMatcher.java rename to src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/SenderCaseMatcher.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventHandlerFactory.java b/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventHandlerFactory.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventHandlerFactory.java rename to src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventHandlerFactory.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventListener.java b/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventListener.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventListener.java rename to src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginEventListener.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/factory/PropertyCollectorFactory.java b/src/main/java/com/epam/reportportal/extension/slack/factory/PropertyCollectorFactory.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/factory/PropertyCollectorFactory.java rename to src/main/java/com/epam/reportportal/extension/slack/factory/PropertyCollectorFactory.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/info/PluginInfoProvider.java b/src/main/java/com/epam/reportportal/extension/slack/info/PluginInfoProvider.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/info/PluginInfoProvider.java rename to src/main/java/com/epam/reportportal/extension/slack/info/PluginInfoProvider.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/info/impl/PluginInfoProviderImpl.java b/src/main/java/com/epam/reportportal/extension/slack/info/impl/PluginInfoProviderImpl.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/info/impl/PluginInfoProviderImpl.java rename to src/main/java/com/epam/reportportal/extension/slack/info/impl/PluginInfoProviderImpl.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackEventType.java b/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackEventType.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackEventType.java rename to src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackEventType.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackIntegrationProperties.java b/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackIntegrationProperties.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackIntegrationProperties.java rename to src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackIntegrationProperties.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/Color.java b/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/Color.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/Color.java rename to src/main/java/com/epam/reportportal/extension/slack/model/enums/template/Color.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/DefaultTemplateProperty.java b/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/DefaultTemplateProperty.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/DefaultTemplateProperty.java rename to src/main/java/com/epam/reportportal/extension/slack/model/enums/template/DefaultTemplateProperty.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/StatisticTemplateProperty.java b/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/StatisticTemplateProperty.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/enums/template/StatisticTemplateProperty.java rename to src/main/java/com/epam/reportportal/extension/slack/model/enums/template/StatisticTemplateProperty.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/template/TemplateProperty.java b/src/main/java/com/epam/reportportal/extension/slack/model/template/TemplateProperty.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/template/TemplateProperty.java rename to src/main/java/com/epam/reportportal/extension/slack/model/template/TemplateProperty.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/template/TextProperty.java b/src/main/java/com/epam/reportportal/extension/slack/model/template/TextProperty.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/model/template/TextProperty.java rename to src/main/java/com/epam/reportportal/extension/slack/model/template/TextProperty.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/utils/MemoizingSupplier.java b/src/main/java/com/epam/reportportal/extension/slack/utils/MemoizingSupplier.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/utils/MemoizingSupplier.java rename to src/main/java/com/epam/reportportal/extension/slack/utils/MemoizingSupplier.java diff --git a/plugin-slack/src/main/java/com/epam/reportportal/extension/slack/utils/NotificationConfigConverter.java b/src/main/java/com/epam/reportportal/extension/slack/utils/NotificationConfigConverter.java similarity index 100% rename from plugin-slack/src/main/java/com/epam/reportportal/extension/slack/utils/NotificationConfigConverter.java rename to src/main/java/com/epam/reportportal/extension/slack/utils/NotificationConfigConverter.java diff --git a/plugin-slack/src/main/resources/binary-data.properties b/src/main/resources/binary-data.properties similarity index 100% rename from plugin-slack/src/main/resources/binary-data.properties rename to src/main/resources/binary-data.properties diff --git a/plugin-slack/src/main/resources/message-template/finish-launch.json b/src/main/resources/message-template/finish-launch.json similarity index 100% rename from plugin-slack/src/main/resources/message-template/finish-launch.json rename to src/main/resources/message-template/finish-launch.json diff --git a/plugin-slack/src/main/resources/scripts/001_add_slack_notification_attribute.sql b/src/main/resources/scripts/001_add_slack_notification_attribute.sql similarity index 100% rename from plugin-slack/src/main/resources/scripts/001_add_slack_notification_attribute.sql rename to src/main/resources/scripts/001_add_slack_notification_attribute.sql diff --git a/plugin-slack/ui/.editorconfig b/ui/.editorconfig similarity index 100% rename from plugin-slack/ui/.editorconfig rename to ui/.editorconfig diff --git a/plugin-slack/ui/.eslintignore b/ui/.eslintignore similarity index 100% rename from plugin-slack/ui/.eslintignore rename to ui/.eslintignore diff --git a/plugin-slack/ui/.eslintrc b/ui/.eslintrc similarity index 100% rename from plugin-slack/ui/.eslintrc rename to ui/.eslintrc diff --git a/plugin-slack/ui/.gitignore b/ui/.gitignore similarity index 100% rename from plugin-slack/ui/.gitignore rename to ui/.gitignore diff --git a/plugin-slack/ui/.prettierrc b/ui/.prettierrc similarity index 100% rename from plugin-slack/ui/.prettierrc rename to ui/.prettierrc diff --git a/plugin-slack/ui/README.md b/ui/README.md similarity index 100% rename from plugin-slack/ui/README.md rename to ui/README.md diff --git a/plugin-slack/ui/devServer.js b/ui/devServer.js similarity index 100% rename from plugin-slack/ui/devServer.js rename to ui/devServer.js diff --git a/plugin-slack/ui/package-lock.json b/ui/package-lock.json similarity index 100% rename from plugin-slack/ui/package-lock.json rename to ui/package-lock.json diff --git a/plugin-slack/ui/package.json b/ui/package.json similarity index 100% rename from plugin-slack/ui/package.json rename to ui/package.json diff --git a/plugin-slack/ui/src/common/css/colors.scss b/ui/src/common/css/colors.scss similarity index 100% rename from plugin-slack/ui/src/common/css/colors.scss rename to ui/src/common/css/colors.scss diff --git a/plugin-slack/ui/src/common/css/fonts.scss b/ui/src/common/css/fonts.scss similarity index 100% rename from plugin-slack/ui/src/common/css/fonts.scss rename to ui/src/common/css/fonts.scss diff --git a/plugin-slack/ui/src/common/css/screen-size.scss b/ui/src/common/css/screen-size.scss similarity index 100% rename from plugin-slack/ui/src/common/css/screen-size.scss rename to ui/src/common/css/screen-size.scss diff --git a/plugin-slack/ui/src/common/css/z-index.scss b/ui/src/common/css/z-index.scss similarity index 100% rename from plugin-slack/ui/src/common/css/z-index.scss rename to ui/src/common/css/z-index.scss diff --git a/plugin-slack/ui/src/components/moduleName/index.ts b/ui/src/components/moduleName/index.ts similarity index 100% rename from plugin-slack/ui/src/components/moduleName/index.ts rename to ui/src/components/moduleName/index.ts diff --git a/plugin-slack/ui/src/components/moduleName/moduleName.tsx b/ui/src/components/moduleName/moduleName.tsx similarity index 100% rename from plugin-slack/ui/src/components/moduleName/moduleName.tsx rename to ui/src/components/moduleName/moduleName.tsx diff --git a/plugin-slack/ui/src/declarations.d.ts b/ui/src/declarations.d.ts similarity index 100% rename from plugin-slack/ui/src/declarations.d.ts rename to ui/src/declarations.d.ts diff --git a/plugin-slack/ui/src/index.ts b/ui/src/index.ts similarity index 100% rename from plugin-slack/ui/src/index.ts rename to ui/src/index.ts diff --git a/plugin-slack/ui/src/metadata.json b/ui/src/metadata.json similarity index 100% rename from plugin-slack/ui/src/metadata.json rename to ui/src/metadata.json diff --git a/plugin-slack/ui/src/plugin-icon.svg b/ui/src/plugin-icon.svg similarity index 100% rename from plugin-slack/ui/src/plugin-icon.svg rename to ui/src/plugin-icon.svg diff --git a/plugin-slack/ui/tsconfig.eslint.json b/ui/tsconfig.eslint.json similarity index 100% rename from plugin-slack/ui/tsconfig.eslint.json rename to ui/tsconfig.eslint.json diff --git a/plugin-slack/ui/tsconfig.json b/ui/tsconfig.json similarity index 100% rename from plugin-slack/ui/tsconfig.json rename to ui/tsconfig.json diff --git a/plugin-slack/ui/webpack.config.js b/ui/webpack.config.js similarity index 100% rename from plugin-slack/ui/webpack.config.js rename to ui/webpack.config.js