Skip to content

Commit

Permalink
Update build (#5863)
Browse files Browse the repository at this point in the history
* Update build; fix #5853
  • Loading branch information
stevemessick authored Nov 19, 2021
1 parent 8ae9356 commit a22560e
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml

This file was deleted.

3 changes: 1 addition & 2 deletions flutter-idea/src/io/flutter/survey/FlutterSurveyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
public class FlutterSurveyService {
private static final String FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY = "FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY";
private static final long CHECK_INTERVAL_IN_MS = TimeUnit.HOURS.toMillis(40);
private static final String CONTENT_URL = "https://flutter.dev/f/flutter-survey-metadata.json";
private static final String CONTENT_URL = "https://docs.flutter.dev/f/flutter-survey-metadata.json";
private static final PropertiesComponent properties = PropertiesComponent.getInstance();
private static final Logger LOG = Logger.getInstance(FlutterSurveyService.class);
private static FlutterSurvey cachedSurvey;


private static boolean timeToUpdateCachedContent() {
// Don't check more often than daily.
final long currentTimeMillis = System.currentTimeMillis();
Expand Down
6 changes: 5 additions & 1 deletion flutter-idea/src/io/flutter/utils/JxBrowserUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ public class JxBrowserUtils {
public String getPlatformFileName() throws FileNotFoundException {
String name = "";
if (SystemInfo.isMac) {
name = "mac";
if (SystemInfo.OS_ARCH.equals("aarch64")) {
name = "mac-arm";
} else {
name = "mac";
}
} else if (SystemInfo.isWindows) {
if (SystemInfo.is32Bit) {
name = "win32";
Expand Down
14 changes: 13 additions & 1 deletion product-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,19 @@
"baseVersion": "212.5284.40",
"dartPluginVersion": "212.5486",
"sinceBuild": "212.5284.40",
"untilBuild": "212.5284.40"
"untilBuild": "212.5457.46"
},
{
"channel": "dev",
"comments": "IntelliJ 2021.3 Beta",
"name": "2021.3 Beta",
"version": "2021.3",
"ideaProduct": "ideaIC",
"ideaVersion": "213.5744.125",
"baseVersion": "213.5744.125",
"dartPluginVersion": "213.5744.122",
"sinceBuild": "213.5744.125",
"untilBuild": "213.*"
}
]
}
3 changes: 3 additions & 0 deletions tool/plugin/test/plugin_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ void main() {
'android-studio',
'ideaIC',
'android-studio',
'ideaIC',
]));
});
});
Expand All @@ -63,6 +64,7 @@ void main() {
'android-studio',
'ideaIC',
'android-studio',
'ideaIC',
]));
});
});
Expand All @@ -79,6 +81,7 @@ void main() {
'android-studio',
'ideaIC',
'android-studio',
'ideaIC',
]));
});
});
Expand Down

0 comments on commit a22560e

Please sign in to comment.