Skip to content

Update build #5863

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.

Sign up for GitHub

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 4 commits into from
Nov 19, 2021
Merged

Update build #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf71290
Update build; fix #5853
stevemessick Nov 18, 2021
c72490b
cleanup
stevemessick Nov 18, 2021
8cb1148
cleanup
stevemessick Nov 18, 2021
6859eb8
cleanup
stevemessick Nov 18, 2021
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
10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions flutter-idea/src/io/flutter/survey/FlutterSurveyService.java
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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