Skip to content

Initial support 2024.2 & Android Studio Ladybug Canary 6 #7608

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

Merged
merged 2 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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]
version: [2023.3, 2024.1, 2024.2]
steps:
- name: checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 81.1
- Initial support 2024.2 & Android Studio Ladybug Canary 6 (#7595)

# 81
- New icons to match "New UI" features in IntelliJ and Android Studio (#6595)
- Restore Flutter test icons in the editor gutter (#7505)
Expand Down
16 changes: 15 additions & 1 deletion product-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,28 @@
"comments": "IntelliJ 2024.1, Android Studio Koala 2024.1",
"name": "2024.1",
"version": "2024.1",
"isUnitTestTarget": "true",
"isUnitTestTarget": "false",
"ideaProduct": "android-studio",
"ideaVersion": "2024.1.1.1",
"baseVersion": "241.18034.62",
"androidPluginVersion": "X.Y.Z",
"dartPluginVersion": "241.17502",
"sinceBuild": "241.14494.150",
"untilBuild": "241.*"
},
{
"channel": "stable",
"comments": "IntelliJ 2024.2, Android Studio Ladybug 2024.2",
"name": "2024.2",
"version": "2024.2",
"isUnitTestTarget": "true",
"ideaProduct": "android-studio",
"ideaVersion": "2024.1.1.1",
"baseVersion": "242.20224.300",
"androidPluginVersion": "X.Y.Z",
"dartPluginVersion": "241.17502",
"sinceBuild": "242.20224.300",
"untilBuild": "242.*"
}
]
}
6 changes: 5 additions & 1 deletion resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<category>Custom Languages</category>
<version>SNAPSHOT</version>
<idea-version since-build="241.14494.150" until-build="241.*"/>
<idea-version since-build="242.20224.300" until-build="242.*"/>

<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.lang</depends>
Expand All @@ -45,6 +45,10 @@

<change-notes>
<![CDATA[
<h1>81.1</h1>
<ul>
<li>Initial support 2024.2 &amp; Android Studio Ladybug Canary 6 (#7595)</li>
</ul>
<h1>81</h1>
<ul>
<li>New icons to match &quot;New UI&quot; features in IntelliJ and Android Studio (#6595)</li>
Expand Down
3 changes: 3 additions & 0 deletions tool/plugin/test/plugin_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void main() {
expect(
specs.map((spec) => spec.ideaProduct).toList(),
orderedEquals([
'android-studio',
'android-studio',
'android-studio'
]));
Expand All @@ -55,6 +56,7 @@ void main() {
expect(
specs.map((spec) => spec.ideaProduct).toList(),
orderedEquals([
'android-studio',
'android-studio',
'android-studio'
]));
Expand All @@ -69,6 +71,7 @@ void main() {
expect(
specs.map((spec) => spec.ideaProduct).toList(),
orderedEquals([
'android-studio',
'android-studio',
'android-studio'
]));
Expand Down