Merge branch 'master' into enhance-build-time

JSUYA · web-flow · commit 3374dfef87cf · 2025-03-25T13:18:18.000+09:00
diff --git a/lib/build_targets/package.dart b/lib/build_targets/package.dart
@@ -102,16 +102,21 @@ class DotnetTpk extends TizenPackage {
         getEngineArtifactsDirectory(buildInfo.targetArch, buildMode);
     final Directory embedderDir =
         getEmbedderArtifactsDirectory(apiVersion, buildInfo.targetArch);
-
     final File engineBinary = engineDir.childFile('libflutter_engine.so');
     final File embedder = embedderDir.childFile('libflutter_tizen_$profile.so');
     final File icuData = engineDir.childFile('icudtl.dat');
+    final File appDepsJson =
+        tizenProject.hostAppRoot.childFile('.app.deps.json');
 
     engineBinary.copySync(libDir.childFile(engineBinary.basename).path);
     // The embedder so name is statically defined in C# code and cannot be
     // provided at runtime, so the file name must be a constant.
     embedder.copySync(libDir.childFile('libflutter_tizen.so').path);
     icuData.copySync(resDir.childFile(icuData.basename).path);
+    appDepsJson.copySync(resDir
+        .childDirectory('flutter_assets')
+        .childFile(appDepsJson.basename)
+        .path);
 
     if (buildMode.isPrecompiled) {
       final File aotSnapshot = environment.buildDir.childFile('app.so');
@@ -280,10 +285,16 @@ class NativeTpk extends TizenPackage {
     final File engineBinary = engineDir.childFile('libflutter_engine.so');
     final File embedder = embedderDir.childFile('libflutter_tizen_$profile.so');
     final File icuData = engineDir.childFile('icudtl.dat');
+    final File appDepsJson =
+        tizenProject.hostAppRoot.childFile('.app.deps.json');
 
     engineBinary.copySync(libDir.childFile(engineBinary.basename).path);
     embedder.copySync(libDir.childFile(embedder.basename).path);
     icuData.copySync(resDir.childFile(icuData.basename).path);
+    appDepsJson.copySync(resDir
+        .childDirectory('flutter_assets')
+        .childFile(appDepsJson.basename)
+        .path);
 
     if (buildMode.isPrecompiled) {
       final File aotSnapshot = environment.buildDir.childFile('app.so');
diff --git a/lib/tizen_plugins.dart b/lib/tizen_plugins.dart
@@ -3,6 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
+
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -25,6 +27,7 @@ import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:package_config/package_config.dart';
 import 'package:yaml/yaml.dart';
 
+import 'tizen_cache.dart';
 import 'tizen_project.dart';
 import 'tizen_sdk.dart';
 
@@ -367,6 +370,7 @@ Future<void> injectTizenPlugins(FlutterProject project) async {
         await findTizenPlugins(project, cppOnly: true);
     final List<TizenPlugin> dotnetPlugins =
         await findTizenPlugins(project, dotnetOnly: true);
+    await _writeAppDepndencyInfo(project);
     await _writeTizenPluginRegistrant(tizenProject, cppPlugins, dotnetPlugins);
     if (tizenProject.isDotnet) {
       await _writeIntermediateDotnetFiles(tizenProject, dotnetPlugins);
@@ -629,3 +633,82 @@ Future<void> renderTemplateToFile(
   await file.create(recursive: true);
   await file.writeAsString(renderedTemplate);
 }
+
+/// See: [_writeFlutterPluginsList] in flutter_plugins.dart
+Future<void> _writeAppDepndencyInfo(
+  FlutterProject project,
+) async {
+  YamlMap? packagesFromPubspecLock() {
+    final File pubspec = project.directory.childFile('pubspec.lock');
+    if (!pubspec.existsSync()) {
+      return null;
+    }
+
+    Object? contents;
+    try {
+      contents = loadYaml(pubspec.readAsStringSync());
+    } on YamlException catch (err) {
+      globals.printTrace('Failed to parse packages from pubspec.lock: $err');
+    }
+    if (contents == null || contents is! YamlMap) {
+      return null;
+    }
+    final Object? packages = contents['packages'];
+    if (packages == null || packages is! YamlMap) {
+      return null;
+    }
+    return packages;
+  }
+
+  final TizenProject tizenProject = TizenProject.fromFlutter(project);
+  final File appDepsJson = tizenProject.hostAppRoot.childFile('.app.deps.json');
+  final List<TizenPlugin> plugins = await findTizenPlugins(project);
+  final List<Map<String, Object>> pluginInfo = <Map<String, Object>>[];
+  final YamlMap? packages = packagesFromPubspecLock();
+  for (final TizenPlugin plugin in plugins) {
+    String version = '';
+    if (packages != null && packages.containsKey(plugin.name)) {
+      final YamlMap package = packages[plugin.name] as YamlMap;
+      if (package.containsKey('version')) {
+        version = package['version'] as String;
+      }
+    }
+    pluginInfo.add(<String, Object>{
+      'name': plugin.name,
+      'version': version,
+    });
+  }
+
+  final Map<String, Object?> result = <String, Object>{};
+  result['info'] =
+      'This is a generated file; do not edit or check into version control.';
+  result['plugins'] = pluginInfo;
+  final Map<String, Object> dart = <String, Object>{};
+  dart['version'] = globals.flutterVersion.dartSdkVersion;
+
+  final Map<String, Object> flutter = <String, Object>{};
+  flutter['version'] = globals.flutterVersion.frameworkVersion;
+
+  final Map<String, Object> flutterTizen = <String, Object>{};
+  flutterTizen['revision'] = globals.flutterVersion.frameworkRevisionShort;
+
+  final Map<String, Object> engine = <String, Object>{};
+  engine['revision'] = globals.flutterVersion.engineRevisionShort;
+
+  final Map<String, Object> embedder = <String, Object>{};
+  final String revision =
+      globals.cache.getStampFor(kTizenEmbedderStampName) ?? '';
+  embedder['revision'] =
+      revision.length > 10 ? revision.substring(0, 10) : revision;
+
+  result['dart'] = dart;
+  result['flutter'] = flutter;
+  result['flutter-tizen'] = flutterTizen;
+  result['engine'] = engine;
+  result['embedder'] = embedder;
+  result['date_created'] = globals.systemClock.now().toString();
+
+  const JsonEncoder encoder = JsonEncoder.withIndent('  ');
+  final String formattedJsonString = encoder.convert(result);
+  appDepsJson.writeAsStringSync(formattedJsonString);
+}
diff --git a/templates/multi-app/cpp/ui/.gitignore b/templates/multi-app/cpp/ui/.gitignore
@@ -4,3 +4,4 @@ flutter/
 crash-info/
 Debug/
 Release/
+.app.deps.json
diff --git a/templates/multi-app/csharp/ui/.gitignore b/templates/multi-app/csharp/ui/.gitignore
@@ -7,3 +7,6 @@ obj/
 # Tizen Core CLI (tz) related files
 tizen_dotnet_project.yaml
 *.csproj.backup
+
+# Flutter-tizen dependency information file
+.app.deps.json
diff --git a/templates/service-app/cpp/.gitignore b/templates/service-app/cpp/.gitignore
@@ -4,3 +4,4 @@ flutter/
 crash-info/
 Debug/
 Release/
+.app.deps.json
diff --git a/templates/service-app/csharp/.gitignore b/templates/service-app/csharp/.gitignore
@@ -7,3 +7,6 @@ obj/
 # Tizen Core CLI (tz) related files
 tizen_dotnet_project.yaml
 *.csproj.backup
+
+# Flutter-tizen dependency information file
+.app.deps.json
diff --git a/templates/ui-app/cpp/.gitignore b/templates/ui-app/cpp/.gitignore
@@ -4,3 +4,4 @@ flutter/
 crash-info/
 Debug/
 Release/
+.app.deps.json
diff --git a/templates/ui-app/csharp/.gitignore b/templates/ui-app/csharp/.gitignore
@@ -7,3 +7,6 @@ obj/
 # Tizen Core CLI (tz) related files
 tizen_dotnet_project.yaml
 *.csproj.backup
+
+# Flutter-tizen dependency information file
+.app.deps.json
diff --git a/test/general/build_targets/package_test.dart b/test/general/build_targets/package_test.dart
@@ -96,6 +96,10 @@ void main() {
       environment.buildDir
           .childFile('tizen_plugins/lib/libshared.so')
           .createSync(recursive: true);
+      projectDir
+          .childDirectory('tizen')
+          .childFile('.app.deps.json')
+          .createSync(recursive: true);
 
       processManager.addCommands(<FakeCommand>[
         FakeCommand(
@@ -143,6 +147,7 @@ void main() {
           ephemeralDir.childFile('lib/libflutter_engine.so');
       final File embedder = ephemeralDir.childFile('lib/libflutter_tizen.so');
       final File icuData = ephemeralDir.childFile('res/icudtl.dat');
+      final File appDepsJson = flutterAssetsDir.childFile('.app.deps.json');
       final File aotSnapshot = ephemeralDir.childFile('lib/libapp.so');
       final File pluginsLib =
           ephemeralDir.childFile('lib/libflutter_plugins.so');
@@ -152,6 +157,7 @@ void main() {
       expect(engineBinary, exists);
       expect(embedder, exists);
       expect(icuData, exists);
+      expect(appDepsJson, exists);
       expect(aotSnapshot, exists);
       expect(pluginsLib, exists);
       expect(pluginsUserLib, exists);
@@ -179,6 +185,10 @@ void main() {
           .childDirectory('flutter_assets')
           .createSync(recursive: true);
       environment.buildDir.childFile('app.so').createSync(recursive: true);
+      projectDir
+          .childDirectory('tizen')
+          .childFile('.app.deps.json')
+          .createSync(recursive: true);
 
       processManager.addCommands(<FakeCommand>[
         FakeCommand(
@@ -256,6 +266,10 @@ type = app
       environment.buildDir
           .childFile('tizen_plugins/lib/libshared.so')
           .createSync(recursive: true);
+      projectDir
+          .childDirectory('tizen')
+          .childFile('.app.deps.json')
+          .createSync(recursive: true);
 
       await NativeTpk(const TizenBuildInfo(
         BuildInfo.release,
@@ -275,6 +289,7 @@ type = app
       final File embedder =
           ephemeralDir.childFile('lib/libflutter_tizen_common.so');
       final File icuData = ephemeralDir.childFile('res/icudtl.dat');
+      final File appDepsJson = flutterAssetsDir.childFile('.app.deps.json');
       final File aotSnapshot = ephemeralDir.childFile('lib/libapp.so');
       final File pluginsLib =
           ephemeralDir.childFile('lib/libflutter_plugins.so');
@@ -284,6 +299,7 @@ type = app
       expect(engineBinary, exists);
       expect(embedder, exists);
       expect(icuData, exists);
+      expect(appDepsJson, exists);
       expect(aotSnapshot, exists);
       expect(pluginsLib, exists);
       expect(pluginsUserLib, exists);
@@ -306,6 +322,10 @@ type = app
       environment.buildDir
           .childDirectory('flutter_assets')
           .createSync(recursive: true);
+      projectDir
+          .childDirectory('tizen')
+          .childFile('.app.deps.json')
+          .createSync(recursive: true);
 
       await expectLater(
         () => NativeTpk(const TizenBuildInfo(
diff --git a/test/general/tizen_plugins_test.dart b/test/general/tizen_plugins_test.dart
@@ -326,6 +326,113 @@ dependencies:
     FileSystem: () => fileSystem,
     ProcessManager: () => FakeProcessManager.any(),
   }, testOn: 'posix');
+
+  testUsingContext('Generates plugins & extra info file for C++', () async {
+    fileSystem.file('tizen/tizen-manifest.xml').createSync(recursive: true);
+
+    final Directory pluginDir = fileSystem.directory('/some_native_plugin');
+    pluginDir.childFile('pubspec.yaml')
+      ..createSync(recursive: true)
+      ..writeAsStringSync('''
+flutter:
+  plugin:
+    platforms:
+      tizen:
+        pluginClass: SomeNativePlugin
+        fileName: some_native_plugin.h
+''');
+    pubspecFile.writeAsStringSync('''
+dependencies:
+  some_native_plugin:
+    path: ${pluginDir.path}
+''');
+    packageConfigFile.writeAsStringSync('''
+{
+  "configVersion": 2,
+  "packages": [
+    {
+      "name": "some_native_plugin",
+      "rootUri": "${pluginDir.uri}",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    }
+  ]
+}
+''');
+    await injectTizenPlugins(project);
+
+    final File appDepsJson = fileSystem.file('tizen/.app.deps.json');
+    expect(appDepsJson, exists);
+    expect(appDepsJson.readAsStringSync(), contains('''
+  "info": "This is a generated file; do not edit or check into version control.",
+  "plugins": [
+    {
+      "name": "some_native_plugin",
+      "version": ""
+    }
+  ],
+'''));
+  }, overrides: <Type, Generator>{
+    FileSystem: () => fileSystem,
+    ProcessManager: () => FakeProcessManager.any(),
+  }, testOn: 'posix');
+
+  testUsingContext('Generates plugins & extra info file for C#', () async {
+    fileSystem.file('tizen/Runner.csproj').createSync(recursive: true);
+    fileSystem.file('tizen/tizen-manifest.xml').createSync(recursive: true);
+
+    final Directory pluginDir = fileSystem.directory('/some_native_plugin');
+    pluginDir.childFile('pubspec.yaml')
+      ..createSync(recursive: true)
+      ..writeAsStringSync('''
+flutter:
+  plugin:
+    platforms:
+      tizen:
+        pluginClass: SomeNativePlugin
+        fileName: some_native_plugin.h
+''');
+    pluginDir.childFile('tizen/project_def.prop')
+      ..createSync(recursive: true)
+      ..writeAsStringSync('''
+APPNAME = some_native_plugin
+type = staticLib
+''');
+    pubspecFile.writeAsStringSync('''
+dependencies:
+  some_native_plugin:
+    path: ${pluginDir.path}
+''');
+    packageConfigFile.writeAsStringSync('''
+{
+  "configVersion": 2,
+  "packages": [
+    {
+      "name": "some_native_plugin",
+      "rootUri": "${pluginDir.uri}",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    }
+  ]
+}
+''');
+    await injectTizenPlugins(project);
+
+    final File appDepsJson = fileSystem.file('tizen/.app.deps.json');
+    expect(appDepsJson, exists);
+    expect(appDepsJson.readAsStringSync(), contains('''
+  "info": "This is a generated file; do not edit or check into version control.",
+  "plugins": [
+    {
+      "name": "some_native_plugin",
+      "version": ""
+    }
+  ],
+'''));
+  }, overrides: <Type, Generator>{
+    FileSystem: () => fileSystem,
+    ProcessManager: () => FakeProcessManager.any(),
+  }, testOn: 'posix');
 }
 
 class _DummyFlutterCommand extends FlutterCommand with DartPluginRegistry {
