Skip to content

Commit a06b479

Browse files
Merge main into feature/dev-execution
2 parents ab23fa8 + f331fb6 commit a06b479

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'"
4+
}

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ configurations {
3535
// IDE provides Kotlin
3636
exclude(group = "org.jetbrains.kotlin")
3737
exclude(group = "org.jetbrains.kotlinx")
38-
39-
exclude(group = "com.fasterxml.jackson.core")
40-
exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
41-
exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
4238
}
4339

4440
configureEach {

buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks.withType<PatchPluginXmlTask>().configureEach {
2020
intellijPlatform {
2121
instrumentCode = false
2222

23-
verifyPlugin {
23+
pluginVerification {
2424
ides {
2525
// recommended() appears to resolve latest EAP for a product?
2626
ide(provider { IntelliJPlatformType.IntellijIdeaCommunity }, toolkitIntelliJ.version())
@@ -65,14 +65,6 @@ dependencies {
6565
}
6666
}
6767

68-
configurations {
69-
runtimeClasspath {
70-
exclude(group = "com.fasterxml.jackson.core")
71-
exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
72-
exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
73-
}
74-
}
75-
7668
tasks.runIde {
7769
systemProperty("aws.toolkit.developerMode", true)
7870
systemProperty("ide.plugins.snapshot.on.unload.fail", true)

0 commit comments

Comments
 (0)