Skip to content

Commit aa64f99

Browse files
aws-toolkit-automationaws-toolkit-automation
authored
Merge main into feature/gettingstarted
2 parents 97d7b54 + a813e14 commit aa64f99

File tree

58 files changed

+352
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+352
-100
lines changed

‎.changes/next-release/feature-dc0ec3e4-b588-4360-84d3-8e5e45b0ae2d.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Added 2023.3 support"
4+
}

‎.run/Run IDE - Core [2023.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Gateway [2023.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Gateway [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-gateway" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Rider [2023.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Ultimate [2023.3].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.3" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We want your feedback!
2323
- Code contributions. See [our contributing guide](CONTRIBUTING.md) for how to get started.
2424

2525
## Supported IDEs
26-
All JetBrains IDEs 2022.3+
26+
All JetBrains IDEs 2023.3+
2727

2828
## Installation
2929

‎buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,51 @@ object IdeVersions {
144144
nugetVersion = "2023.2.0"
145145
)
146146
),
147+
Profile(
148+
name = "2023.3",
149+
gateway = ProductProfile(
150+
sdkFlavor = IdeFlavor.GW,
151+
sdkVersion = "233.11555-EAP-CANDIDATE-SNAPSHOT",
152+
plugins = arrayOf("org.jetbrains.plugins.terminal")
153+
),
154+
community = ProductProfile(
155+
sdkFlavor = IdeFlavor.IC,
156+
sdkVersion = "233.11555-EAP-CANDIDATE-SNAPSHOT",
157+
plugins = commonPlugins + listOf(
158+
"java",
159+
"com.intellij.gradle",
160+
"org.jetbrains.idea.maven",
161+
"PythonCore:233.11555.11",
162+
"Docker:233.11555.11"
163+
)
164+
),
165+
ultimate = ProductProfile(
166+
sdkFlavor = IdeFlavor.IU,
167+
sdkVersion = "233.11555-EAP-CANDIDATE-SNAPSHOT",
168+
plugins = commonPlugins + listOf(
169+
"JavaScript",
170+
// Transitive dependency needed for javascript
171+
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
172+
"com.intellij.css",
173+
"JavaScriptDebugger",
174+
"com.intellij.database",
175+
"com.jetbrains.codeWithMe",
176+
"Pythonid:233.11555.11",
177+
"org.jetbrains.plugins.go:233.11555.11",
178+
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
179+
"org.intellij.intelliLang"
180+
)
181+
),
182+
rider = RiderProfile(
183+
sdkVersion = "2023.3-EAP5-SNAPSHOT",
184+
plugins = commonPlugins + listOf(
185+
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
186+
),
187+
netFrameworkTarget = "net472",
188+
rdGenVersion = "2023.3.2",
189+
nugetVersion = "2023.3.0-eap05"
190+
)
191+
),
147192

148193
).associateBy { it.name }
149194

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ tasks.withType<Test>().all {
155155
// FIX_WHEN_MIN_IS_221: log4j 1.2 removed in 221
156156
systemProperty("log4j.configuration", jetbrainsCoreTestResources.resolve("log4j.xml"))
157157
systemProperty("idea.log.config.properties.file", jetbrainsCoreTestResources.resolve("toolkit-test-log.properties"))
158+
systemProperty("org.gradle.project.ideProfileName", ideProfile.name)
158159

159160
jvmArgs(openedPackages)
160161

‎buildspec/linuxIntegrationTests.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ phases:
1616
commands:
1717
- sed -i 's/latest\/download/download\/v1.98.0/g' /usr/local/bin/installSam.sh
1818
- installSam.sh --update
19-
- n install 16
19+
- goenv versions --bare | xargs -I'{}' goenv uninstall -f '{}'
20+
- goenv install 1.21.3
21+
- goenv global 1.21.3
2022
- startDocker.sh
2123
# login to DockerHub so we don't get throttled
2224
- export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`

‎detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedImportsRule.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class BannedImportsRule : Rule() {
5555
CodeSmell(
5656
issue,
5757
Entity.from(element),
58-
message = "Use contexts from CoroutineUtils.kt instead of Dispatchers"
58+
message = "Use contexts from contexts.kt instead of Dispatchers"
5959
)
6060
)
6161
}

0 commit comments

Comments
 (0)