Skip to content
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

Check for CHROME_PATH env variable in devtools_shared #3805

Merged
merged 4 commits into from
Mar 8, 2022
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.11.3
Check for CHROME_PATH env variable in devtools_shared [#3805](https://github.com/flutter/devtools/pull/3805)

## 2.11.2
* Fix selection issue if file is already visible in program explorer [#3794](https://github.com/flutter/devtools/pull/3794)
* Automatic scrolling in the Program Explorer [#3786](https://github.com/flutter/devtools/pull/3786)
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/lib/devtools.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
// that updates all versions for DevTools.
// Note: a regexp in tools/update_version.dart matches the following line so
// if you change it you must also modify tools/update_version.dart.
const String version = '2.11.2';
const String version = '2.11.3';
6 changes: 3 additions & 3 deletions packages/devtools_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Web-based performance tooling for Dart and Flutter.

# Note: this version should only be updated by running tools/update_version.dart
# that updates all versions of devtools packages (devtools_app, devtools_test).
version: 2.11.2
version: 2.11.3

homepage: https://github.com/flutter/devtools

Expand All @@ -25,7 +25,7 @@ dependencies:
collection: ^1.15.0
dds: ^2.2.0
dds_service_extensions: ^1.3.0
devtools_shared: 2.11.2
devtools_shared: 2.11.3
file: ^6.0.0
file_selector: ^0.8.0
file_selector_linux: ^0.0.2
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.0.4
devtools_test: 2.11.2
devtools_test: 2.11.3
flutter_test:
sdk: flutter
mockito: ^5.0.9
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_app/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
application. For more information, see:
https://developers.google.com/web/fundamentals/primers/service-workers -->
<script>
var version = '2.11.2';
var version = '2.11.3';
var scriptLoaded = false;
function loadMainDartJs() {
if (scriptLoaded) {
Expand Down
3 changes: 3 additions & 0 deletions packages/devtools_shared/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.11.3
Check for CHROME_PATH env variable in devtools_shared [#3805](https://github.com/flutter/devtools/pull/3805)

## 2.11.1
- Update CLI test driver with the correct Dart VM Service prefix
## 2.11.0
Expand Down
5 changes: 5 additions & 0 deletions packages/devtools_shared/lib/src/test/chrome.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ class Chrome {
}
}

final pathFromEnv = Platform.environment['CHROME_PATH'];
if (pathFromEnv != null && FileSystemEntity.isFileSync(pathFromEnv)) {
return Chrome.from(pathFromEnv);
}

// TODO(devoncarew): check default install locations for linux
// TODO(devoncarew): try `which` on mac, linux

Expand Down
2 changes: 1 addition & 1 deletion packages/devtools_shared/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: devtools_shared
description: Package of shared structures between devtools_app, dds, and other tools.

version: 2.11.2
version: 2.11.3

homepage: https://github.com/flutter/devtools

Expand Down
6 changes: 3 additions & 3 deletions packages/devtools_test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: A package containing shared test helpers for Dart DevTools tests.
# When publishing new versions of this package be sure to publish a new version
# of package:devtools as well. package:devtools contains a compiled snapshot of
# this package.
version: 2.11.2
version: 2.11.3

homepage: https://github.com/flutter/devtools

Expand All @@ -20,8 +20,8 @@ environment:
dependencies:
async: ^2.0.0
collection: ^1.15.0
devtools_shared: 2.11.2
devtools_app: 2.11.2
devtools_shared: 2.11.3
devtools_app: 2.11.3
flutter:
sdk: flutter
flutter_test:
Expand Down