Skip to content

Commit 20c3fb6

Browse files
committed
Fix issues related to test execution
1 parent cb529f0 commit 20c3fb6

File tree

5 files changed

+35
-8
lines changed

5 files changed

+35
-8
lines changed

plugins/core/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ tasks.shadowJar {
4444
archiveVersion.set(rootProject.version.toString())
4545
archiveClassifier.set("")
4646

47+
exclude("/META-INF/plugin.xml")
48+
4749
configurations = project.configurations.runtimeClasspath.map { listOf(it) }
4850
destinationDirectory.set(layout.buildDirectory.dir("libs"))
4951
}

plugins/core/jetbrains-community/resources/META-INF/module-core.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!-- SPDX-License-Identifier: Apache-2.0 -->
33

44
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
5-
<xi:include href="/META-INF/aws.toolkit.core.xml" />
6-
75
<extensions defaultExtensionNs="aws.toolkit.core">
86
<credentialProviderFactory implementation="software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileCredentialProviderFactory"/>
97

@@ -12,4 +10,3 @@
1210
<connection.pinned.feature implementation="software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection"/>
1311
</extensions>
1412
</idea-plugin>
15-
\
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!-- Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
4+
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" require-restart="true">
5+
<id>aws.toolkit.core</id>
6+
<name>AWS Core</name>
7+
<description><![CDATA[
8+
<p>This plugin is required to use the <a href="https://plugins.jetbrains.com/plugin/24267-amazon-q/">Amazon Q</a> or <a href="https://plugins.jetbrains.com/plugin/11349-aws-toolkit--amazon-q-codewhisperer-and-more">AWS Toolkit</a> plugins. It will be automatically installed if you install either plugin.</p>
9+
]]></description>
10+
<vendor email="[email protected]" url="https://github.com/aws/aws-toolkit-jetbrains">AWS</vendor>
11+
<version>1.0</version>
12+
<idea-version since-build="232" />
13+
<depends>com.intellij.modules.platform</depends>
14+
15+
<incompatible-with>com.intellij.cwm.guest</incompatible-with>
16+
<incompatible-with>com.intellij.jetbrains.client</incompatible-with>
17+
<incompatible-with>com.intellij.gateway</incompatible-with>
18+
19+
<xi:include href="/META-INF/aws.toolkit.core.xml" />
20+
<xi:include href="/META-INF/module-core.xml" />
21+
22+
<extensions defaultExtensionNs="com.intellij">
23+
<!-- each plugin needs its own instance of these -->
24+
<applicationService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
25+
<projectService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
26+
<postStartupActivity implementation = "software.aws.toolkits.jetbrains.core.notifications.NotificationServiceInitializer"/>
27+
<postStartupActivity implementation="software.aws.toolkits.jetbrains.services.telemetry.AwsToolkitStartupMetrics"/>
28+
</extensions>
29+
<projectListeners>
30+
<listener class="software.aws.toolkits.jetbrains.services.telemetry.OpenedFileTypesMetricsListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"/>
31+
</projectListeners>
32+
33+
</idea-plugin>

plugins/toolkit/jetbrains-gateway/resources-gatewayOnly/META-INF/plugin-shim.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@
33

44
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
55
<xi:include href="/META-INF/module-core.xml" />
6-
7-
<extensions defaultExtensionNs="com.intellij">
8-
<applicationService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
9-
<projectService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
10-
</extensions>
116
</idea-plugin>

0 commit comments

Comments
 (0)