Skip to content

Commit 1c2ab73

Browse files
authored
Initial support 2024.2 & Android Studio Ladybug Canary 6 (flutter#7608)
This resolves flutter#7595
1 parent 5186280 commit 1c2ab73

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

.github/workflows/presubmit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
version: [2023.3, 2024.1]
24+
version: [2023.3, 2024.1, 2024.2]
2525
steps:
2626
- name: checkout
2727
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 81.1
2+
- Initial support 2024.2 & Android Studio Ladybug Canary 6 (#7595)
3+
14
# 81
25
- New icons to match "New UI" features in IntelliJ and Android Studio (#6595)
36
- Restore Flutter test icons in the editor gutter (#7505)

product-matrix.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,28 @@
1919
"comments": "IntelliJ 2024.1, Android Studio Koala 2024.1",
2020
"name": "2024.1",
2121
"version": "2024.1",
22-
"isUnitTestTarget": "true",
22+
"isUnitTestTarget": "false",
2323
"ideaProduct": "android-studio",
2424
"ideaVersion": "2024.1.1.1",
2525
"baseVersion": "241.18034.62",
2626
"androidPluginVersion": "X.Y.Z",
2727
"dartPluginVersion": "241.17502",
2828
"sinceBuild": "241.14494.150",
2929
"untilBuild": "241.*"
30+
},
31+
{
32+
"channel": "stable",
33+
"comments": "IntelliJ 2024.2, Android Studio Ladybug 2024.2",
34+
"name": "2024.2",
35+
"version": "2024.2",
36+
"isUnitTestTarget": "true",
37+
"ideaProduct": "android-studio",
38+
"ideaVersion": "2024.1.1.1",
39+
"baseVersion": "242.20224.300",
40+
"androidPluginVersion": "X.Y.Z",
41+
"dartPluginVersion": "241.17502",
42+
"sinceBuild": "242.20224.300",
43+
"untilBuild": "242.*"
3044
}
3145
]
3246
}

resources/META-INF/plugin.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

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

2626
<depends>com.intellij.modules.platform</depends>
2727
<depends>com.intellij.modules.lang</depends>
@@ -45,6 +45,10 @@
4545

4646
<change-notes>
4747
<![CDATA[
48+
<h1>81.1</h1>
49+
<ul>
50+
<li>Initial support 2024.2 &amp; Android Studio Ladybug Canary 6 (#7595)</li>
51+
</ul>
4852
<h1>81</h1>
4953
<ul>
5054
<li>New icons to match &quot;New UI&quot; features in IntelliJ and Android Studio (#6595)</li>

tool/plugin/test/plugin_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ void main() {
4141
expect(
4242
specs.map((spec) => spec.ideaProduct).toList(),
4343
orderedEquals([
44+
'android-studio',
4445
'android-studio',
4546
'android-studio'
4647
]));
@@ -55,6 +56,7 @@ void main() {
5556
expect(
5657
specs.map((spec) => spec.ideaProduct).toList(),
5758
orderedEquals([
59+
'android-studio',
5860
'android-studio',
5961
'android-studio'
6062
]));
@@ -69,6 +71,7 @@ void main() {
6971
expect(
7072
specs.map((spec) => spec.ideaProduct).toList(),
7173
orderedEquals([
74+
'android-studio',
7275
'android-studio',
7376
'android-studio'
7477
]));

0 commit comments

Comments
 (0)