release: upgrade to flutter 3.16.0

Signed-off-by: Hidenori Matsubayashi <[email protected]>

bin/internal/engine.version

@@ -1 +1 @@
-0545f8705df301877d787107bac1a6e9fc9ee1ad
+74d16627b940bb15e50891f82cad6c3e3465bd6d

bin/internal/flutter.version

@@ -1,2 +1,2 @@
-d211f42860350d914a5ad8102f9ec32764dc6d06
-3.13.9
+db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+3.16.0

lib/commands/attach.dart

@@ -11,7 +11,6 @@ class ELinuxAttachCommand extends AttachCommand with ELinuxExtension {
   ELinuxAttachCommand({
     super.verboseHelp,
     super.hotRunnerFactory,
-    required super.artifacts,
     required super.stdio,
     required super.logger,
     required super.terminal,

lib/elinux_build_target.dart

@@ -342,13 +342,14 @@ class NativeBundle {
       final LocalEngineInfo? localEngineInfo =
           globals.artifacts?.localEngineInfo;
       if (localEngineInfo != null) {
-        final String engineOutPath = localEngineInfo.engineOutPath;
-        environmentConfig['FLUTTER_ENGINE'] =
-            globals.fs.path.dirname(globals.fs.path.dirname(engineOutPath));
-        environmentConfig['LOCAL_ENGINE'] = localEngineInfo.localEngineName;
+        final String targetOutPath = localEngineInfo.targetOutPath;
+        // $ENGINE/src/out/foo_bar_baz -> $ENGINE/src
+        environmentConfig['FLUTTER_ENGINE'] = globals.fs.path.dirname(globals.fs.path.dirname(targetOutPath));
+        environmentConfig['LOCAL_ENGINE'] = localEngineInfo.localTargetName;
+        environmentConfig['LOCAL_ENGINE_HOST'] = localEngineInfo.localHostName;
       }
       writeGeneratedCmakeConfig(Cache.flutterRoot!, eLinuxProject,
-          buildInfo!.buildInfo, environmentConfig);
+          buildInfo!.buildInfo, environmentConfig, environment.logger);
     }
 
     // Run the native build.

lib/elinux_device.dart

@@ -157,12 +157,12 @@ class ELinuxDevice extends Device {
           _config!.runDebugCommand,
           <String, String>{'remotePath': '/tmp/', 'appName': package.name!});
 
-      _logger.printStatus('Launch $package.name on ${_config!.id}');
+      _logger.printStatus('Launch $package.name on ${_config.id}');
       final Process process = await _processManager.start(interpolated);
 
       final ProtocolDiscovery discovery = ProtocolDiscovery.vmService(
         _logReader,
-        portForwarder: _config!.usesPortForwarding ? portForwarder : null,
+        portForwarder: _config.usesPortForwarding ? portForwarder : null,
         hostPort: debuggingOptions?.hostVmServicePort,
         devicePort: debuggingOptions?.deviceVmServicePort,
         logger: _logger,
@@ -174,7 +174,7 @@ class ELinuxDevice extends Device {
       final Uri? observatoryUri = await discovery.uri;
       await discovery.cancel();
 
-      if (_config!.usesPortForwarding) {
+      if (_config.usesPortForwarding) {
         _forwardedHostPort = observatoryUri!.port;
       }
 
@@ -264,7 +264,7 @@ class ELinuxDevice extends Device {
     // Stop app for remote devices.
     if (!_desktop && _config!.stopAppCommand.isNotEmpty) {
       final List<String> interpolated = interpolateCommand(
-          _config!.stopAppCommand, <String, String>{'appName': app!.name!});
+          _config.stopAppCommand, <String, String>{'appName': app!.name!});
       try {
         _logger.printStatus('Stop ${app.name!} for custom device.');
         await _processUtils.run(interpolated,
@@ -435,18 +435,18 @@ class ELinuxDevice extends Device {
       Duration? timeout,
       Map<String, String> additionalReplacementValues =
           const <String, String>{}}) async {
-    if (_config == null || _config!.uninstallCommand.isEmpty) {
+    if (_config == null || _config.uninstallCommand.isEmpty) {
       // do nothing if uninstall command is not defined.
       _logger.printTrace('uninstall command is not defined.');
       return true;
     }
 
     final List<String> interpolated = interpolateCommand(
-        _config!.uninstallCommand, <String, String>{'appName': appName},
+        _config.uninstallCommand, <String, String>{'appName': appName},
         additionalReplacementValues: additionalReplacementValues);
 
     try {
-      _logger.printStatus('Uninstall $appName from ${_config!.id}.');
+      _logger.printStatus('Uninstall $appName from ${_config.id}.');
       await _processUtils.run(interpolated,
           throwOnError: true, timeout: timeout);
       _logger.printStatus('Uninstallation Success');
@@ -471,7 +471,7 @@ class ELinuxDevice extends Device {
         additionalReplacementValues: additionalReplacementValues);
 
     try {
-      _logger.printStatus('Install $appName ($localPath) to ${_config!.id}');
+      _logger.printStatus('Install $appName ($localPath) to ${_config.id}');
       await _processUtils.run(interpolated,
           throwOnError: true, timeout: timeout);
       _logger.printStatus('Installation Success');

lib/executable.dart

@@ -100,7 +100,6 @@ Future<void> main(List<String> args) async {
       ELinuxAnalyzeCommand(verboseHelp: verboseHelp),
       ELinuxAttachCommand(
         verboseHelp: verboseHelp,
-        artifacts: globals.artifacts,
         stdio: globals.stdio,
         logger: globals.logger,
         terminal: globals.terminal,

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/sony/flutter-elinux
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   flutter_tools:
@@ -20,6 +20,4 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito:
-  pedantic:
   test: