Skip to content

Commit c1ef114

Browse files
authored
Build for 2023.2 EAP (#6763)
Fixes #6761
1 parent 3acc3c4 commit c1ef114

File tree

6 files changed

+35
-5
lines changed

6 files changed

+35
-5
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: [2022.1, 2022.2, 2022.3, 2023.1]
24+
version: [2022.1, 2022.2, 2022.3, 2023.1, 2023.2]
2525
steps:
2626
- name: checkout
2727
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

flutter-idea/src/io/flutter/FlutterUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.jetbrains.annotations.Nullable;
4646
import org.jetbrains.annotations.SystemIndependent;
4747
import org.yaml.snakeyaml.DumperOptions;
48+
import org.yaml.snakeyaml.LoaderOptions;
4849
import org.yaml.snakeyaml.Yaml;
4950
import org.yaml.snakeyaml.constructor.SafeConstructor;
5051
import org.yaml.snakeyaml.nodes.Tag;

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name = "flutter-intellij"
22
org.gradle.parallel=true
33
org.gradle.jvmargs=-Xms1024m -Xmx4048m
44
javaVersion=17
5-
dartVersion=231.7864.77
5+
dartVersion=232.6095.10
66
flutterPluginVersion=1
77
ide=android-studio
88
testing=true
9-
buildSpec=2023.1
10-
baseVersion=231.7864.76
9+
buildSpec=2023.2
10+
baseVersion=232.6095.10
1111
smaliPlugin=com.android.tools.idea.smali
1212
langPlugin=org.intellij.intelliLang
1313
kotlin.stdlib.default.dependency=false
14-
ideVersion=2023.1.1.3
14+
ideVersion=2023.2

product-matrix.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@
6262
"dartPluginVersion": "231.7864.77",
6363
"sinceBuild": "231.7864.76",
6464
"untilBuild": "231.*"
65+
},
66+
{
67+
"channel": "stable",
68+
"comments": "IntelliJ 2023.2",
69+
"name": "2023.2",
70+
"version": "2023.2",
71+
"ideaProduct": "ideaIC",
72+
"ideaVersion": "2023.2",
73+
"baseVersion": "LATEST-EAP-SNAPSHOT",
74+
"dartPluginVersion": "232.6095.10",
75+
"sinceBuild": "232.6095.10",
76+
"untilBuild": "232.*"
6577
}
6678
]
6779
}

tool/plugin/lib/edit.dart

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@ const String _actionThreadEditContent = '''
3333
''';
3434

3535
List<EditCommand> editCommands = [
36+
EditCommand(
37+
path: 'flutter-idea/src/io/flutter/FlutterUtils.java',
38+
initials: [
39+
'''
40+
final Yaml yaml = new Yaml(new SafeConstructor(), new Representer(), new DumperOptions(), new Resolver() {
41+
'''
42+
],
43+
replacements: [
44+
'''
45+
final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()), new Representer(new DumperOptions()), new DumperOptions(), new Resolver() {
46+
'''
47+
],
48+
versions: ['2023.2'],
49+
),
3650
// When using LATEST-EAP-SNAPSHOT, also set baseVersion to LATEST-EAP-SNAPSHOT in the build spec.
3751
EditCommand(
3852
path: 'build.gradle.kts',

tool/plugin/test/plugin_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ void main() {
4646
'android-studio',
4747
'android-studio',
4848
'android-studio',
49+
'ideaIC'
4950
]));
5051
});
5152
});
@@ -63,6 +64,7 @@ void main() {
6364
'android-studio',
6465
'android-studio',
6566
'android-studio',
67+
'ideaIC'
6668
]));
6769
});
6870
});
@@ -80,6 +82,7 @@ void main() {
8082
'android-studio',
8183
'android-studio',
8284
'android-studio',
85+
'ideaIC'
8386
]));
8487
});
8588
});

0 commit comments

Comments
 (0)