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.

Sign up for GitHub

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

Add an optional dependency on the Gemini Code Assist IJ plugin #7964

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Add an optional dependency on the Gemini Code Assist IJ plugin #7964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [2023.3, 2024.1, 2024.2, 2024.3]
version: [2024.1, 2024.2, 2024.3]
steps:
- name: checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ dependencies {
"org.jetbrains.kotlin",
"org.jetbrains.plugins.gradle",
"org.intellij.intelliLang",
"com.google.tools.ij.aiplugin",
Copy link
Member

Choose a reason for hiding this comment

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

should this be in the next if statement, only if the product is android studio?

Copy link
Member Author

Choose a reason for hiding this comment

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

If we can provide the support to all users without additional work we should. It may be the case that some support is added through here, and other support will be AS specific.

)
if (ideaProduct == "android-studio") {
bundledPluginList.add("org.jetbrains.android")
Expand Down
1 change: 1 addition & 0 deletions flutter-idea/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ dependencies {
"org.jetbrains.kotlin",
"org.jetbrains.plugins.gradle",
"org.intellij.intelliLang",
"com.google.tools.ij.aiplugin",
Copy link
Member

Choose a reason for hiding this comment

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

same here and below

)
if (ideaProduct == "android-studio") {
bundledPluginList.add("org.jetbrains.android")
Expand Down
1 change: 1 addition & 0 deletions flutter-studio/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ dependencies {
"org.jetbrains.kotlin",
"org.jetbrains.plugins.gradle",
"org.intellij.intelliLang",
"com.google.tools.ij.aiplugin",
)
if (ideaProduct == "android-studio") {
bundledPluginList.add("org.jetbrains.android")
Expand Down
15 changes: 0 additions & 15 deletions product-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
{
"list": [
{
"channel": "stable",
"comments": "IntelliJ 2023.3, Android Studio Jellyfish 2023.3",
"name": "2023.3",
"version": "2023.3",
"ijVersion": "2023.3",
"ideaProduct": "android-studio",
"ideaVersion": "2023.3.1.16",
"baseVersion": "233.14808.21",
"dartPluginVersion": "233.15271",
"androidPluginVersion": "",
"sinceBuild": "233",
"untilBuild": "233.*",
"isUnitTestTarget": "false"
},
{
"channel": "stable",
"comments": "IntelliJ 2024.1, Android Studio Koala 2024.1",
Expand Down
6 changes: 6 additions & 0 deletions resources/META-INF/gemini-contribs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!-- Defines Gemini Code Assist extensions. -->
<!-- https://developers.google.com/gemini-code-assist/docs/overview-->
<!-- https://plugins.jetbrains.com/plugin/24198-gemini-code-assist-->
<!-- https://developer.android.com/studio/preview/gemini-->
<idea-plugin>
</idea-plugin>
3 changes: 3 additions & 0 deletions resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<!-- Contributes IDEA-specific features and implementations. -->
<depends optional="true" config-file="idea-contribs.xml">com.intellij.modules.java</depends>

<!-- Contributes Gemini Code Assist extensions. -->
<depends optional="true" config-file="gemini-contribs.xml">com.google.tools.ij.aiplugin</depends>

<!-- Contributes Android Studio-specific features and implementations. -->
<!--suppress PluginXmlValidity -->
<depends optional="true" config-file="studio-contribs.xml">com.intellij.modules.androidstudio</depends>
Expand Down
3 changes: 3 additions & 0 deletions resources/META-INF/plugin_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<!-- Contributes IDEA-specific features and implementations. -->
<depends optional="true" config-file="idea-contribs.xml">com.intellij.modules.java</depends>

<!-- Contributes Gemini Code Assist extensions. -->
<depends optional="true" config-file="gemini-contribs.xml">com.google.tools.ij.aiplugin</depends>

<!-- Contributes Android Studio-specific features and implementations. -->
<!--suppress PluginXmlValidity -->
<depends optional="true" config-file="studio-contribs.xml">@DEPEND@</depends>
Expand Down