Skip to content

Commit a22560e

Browse files
authored
Update build (#5863)
* Update build; fix #5853
1 parent 8ae9356 commit a22560e

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

.idea/runConfigurations.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

flutter-idea/src/io/flutter/survey/FlutterSurveyService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
public class FlutterSurveyService {
2121
private static final String FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY = "FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY";
2222
private static final long CHECK_INTERVAL_IN_MS = TimeUnit.HOURS.toMillis(40);
23-
private static final String CONTENT_URL = "https://flutter.dev/f/flutter-survey-metadata.json";
23+
private static final String CONTENT_URL = "https://docs.flutter.dev/f/flutter-survey-metadata.json";
2424
private static final PropertiesComponent properties = PropertiesComponent.getInstance();
2525
private static final Logger LOG = Logger.getInstance(FlutterSurveyService.class);
2626
private static FlutterSurvey cachedSurvey;
2727

28-
2928
private static boolean timeToUpdateCachedContent() {
3029
// Don't check more often than daily.
3130
final long currentTimeMillis = System.currentTimeMillis();

flutter-idea/src/io/flutter/utils/JxBrowserUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ public class JxBrowserUtils {
2222
public String getPlatformFileName() throws FileNotFoundException {
2323
String name = "";
2424
if (SystemInfo.isMac) {
25-
name = "mac";
25+
if (SystemInfo.OS_ARCH.equals("aarch64")) {
26+
name = "mac-arm";
27+
} else {
28+
name = "mac";
29+
}
2630
} else if (SystemInfo.isWindows) {
2731
if (SystemInfo.is32Bit) {
2832
name = "win32";

product-matrix.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,19 @@
4848
"baseVersion": "212.5284.40",
4949
"dartPluginVersion": "212.5486",
5050
"sinceBuild": "212.5284.40",
51-
"untilBuild": "212.5284.40"
51+
"untilBuild": "212.5457.46"
52+
},
53+
{
54+
"channel": "dev",
55+
"comments": "IntelliJ 2021.3 Beta",
56+
"name": "2021.3 Beta",
57+
"version": "2021.3",
58+
"ideaProduct": "ideaIC",
59+
"ideaVersion": "213.5744.125",
60+
"baseVersion": "213.5744.125",
61+
"dartPluginVersion": "213.5744.122",
62+
"sinceBuild": "213.5744.125",
63+
"untilBuild": "213.*"
5264
}
5365
]
5466
}

tool/plugin/test/plugin_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ void main() {
4747
'android-studio',
4848
'ideaIC',
4949
'android-studio',
50+
'ideaIC',
5051
]));
5152
});
5253
});
@@ -63,6 +64,7 @@ void main() {
6364
'android-studio',
6465
'ideaIC',
6566
'android-studio',
67+
'ideaIC',
6668
]));
6769
});
6870
});
@@ -79,6 +81,7 @@ void main() {
7981
'android-studio',
8082
'ideaIC',
8183
'android-studio',
84+
'ideaIC',
8285
]));
8386
});
8487
});

0 commit comments

Comments
 (0)