Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure repo layout to clarify feature vertical boundaries #4132

Merged
merged 14 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
* @aws/aws-ides-team
codewhisperer/ @aws/codewhisperer-team
amazonq/ @aws/aws-mynah
cwc/ @aws/aws-mynah
mynah-ui/ @aws/aws-mynah
codemodernizer/ @aws/elastic-gumby
6 changes: 3 additions & 3 deletions .github/workflows/ssm-integ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
run: git config --system core.longpaths true
if: ${{ matrix.os == 'windows-latest' }}
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew :jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.ssm.SsmPluginTest"
run: ./gradlew :tookit-plugin:jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.ssm.SsmPluginTest"
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,19 @@ stale_outputs_checked
global.json

# local dev files
unload-PythonCore-*
unload-aws.toolkit-*
unload-*
jetbrains-core/bin/
jetbrains-ultimate/bin/
resources/bin/
jetbrains-rider/**/NuGet.config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will these path names need to be changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can adjust again if we change the paths again, but it shouldn't be necessary

RiderSdkPackageVersion.props
*.Generated.cs
core/bin
jetbrains-gateway/bin
jetbrains-rider/bin
sdk-codegen/bin
ui-tests/bin

#CodeWhispererChat

/jetbrains-rider/testData/NuGet.config
/jetbrains-core/ui/package-lock.json
node_modules
package-lock.json
!mynah-ui/package-lock.json

25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Core [2023.1].run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Core [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.2" />
<option name="taskDescriptions">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.3" />
<option name="taskDescriptions">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Gateway [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.3" />
<option name="taskDescriptions">
Expand Down
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Rider [2023.1].run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Rider [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.2" />
<option name="taskDescriptions">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.3" />
<option name="taskDescriptions">
Expand Down
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Ultimate [2023.1].run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.2" />
<option name="taskDescriptions">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run IDE - Gateway [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-gateway" />
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PideProfileName=2023.3" />
<option name="taskDescriptions">
Expand Down
25 changes: 0 additions & 25 deletions .run/Run IDE - Core [2023.1].run.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .run/Run IDE - Rider [2023.1].run.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .run/Run IDE - Ultimate [2023.1].run.xml

This file was deleted.

Loading
Loading