Skip to content

Build for 2023.2 EAP #6763

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
May 22, 2023
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: [2022.1, 2022.2, 2022.3, 2023.1]
version: [2022.1, 2022.2, 2022.3, 2023.1, 2023.2]
steps:
- name: checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
Expand Down
1 change: 1 addition & 0 deletions flutter-idea/src/io/flutter/FlutterUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.SystemIndependent;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.nodes.Tag;
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name = "flutter-intellij"
org.gradle.parallel=true
org.gradle.jvmargs=-Xms1024m -Xmx4048m
javaVersion=17
dartVersion=231.7864.77
dartVersion=232.6095.10
flutterPluginVersion=1
ide=android-studio
testing=true
buildSpec=2023.1
baseVersion=231.7864.76
buildSpec=2023.2
baseVersion=232.6095.10
smaliPlugin=com.android.tools.idea.smali
langPlugin=org.intellij.intelliLang
kotlin.stdlib.default.dependency=false
ideVersion=2023.1.1.3
ideVersion=2023.2
12 changes: 12 additions & 0 deletions product-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@
"dartPluginVersion": "231.7864.77",
"sinceBuild": "231.7864.76",
"untilBuild": "231.*"
},
{
"channel": "stable",
"comments": "IntelliJ 2023.2",
"name": "2023.2",
"version": "2023.2",
"ideaProduct": "ideaIC",
"ideaVersion": "2023.2",
"baseVersion": "LATEST-EAP-SNAPSHOT",
"dartPluginVersion": "232.6095.10",
"sinceBuild": "232.6095.10",
"untilBuild": "232.*"
}
]
}
14 changes: 14 additions & 0 deletions tool/plugin/lib/edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@ const String _actionThreadEditContent = '''
''';

List<EditCommand> editCommands = [
EditCommand(
path: 'flutter-idea/src/io/flutter/FlutterUtils.java',
initials: [
'''
final Yaml yaml = new Yaml(new SafeConstructor(), new Representer(), new DumperOptions(), new Resolver() {
'''
],
replacements: [
'''
final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()), new Representer(new DumperOptions()), new DumperOptions(), new Resolver() {
'''
],
versions: ['2023.2'],
),
// When using LATEST-EAP-SNAPSHOT, also set baseVersion to LATEST-EAP-SNAPSHOT in the build spec.
EditCommand(
path: 'build.gradle.kts',
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 @@ -46,6 +46,7 @@ void main() {
'android-studio',
'android-studio',
'android-studio',
'ideaIC'
]));
});
});
Expand All @@ -63,6 +64,7 @@ void main() {
'android-studio',
'android-studio',
'android-studio',
'ideaIC'
]));
});
});
Expand All @@ -80,6 +82,7 @@ void main() {
'android-studio',
'android-studio',
'android-studio',
'ideaIC'
]));
});
});
Expand Down