Upgrade to Flutter 3.24.1 (flutter-tizen#566)

Co-authored-by: Swift Kim <[email protected]>

Author: JSUYA

bin/internal/embedder.version

@@ -1 +1 @@
-36f818a8ab2ef36eabfeabe0c8aa76c0b92f02c1
+b0fd447d3b9bdb56cd7751ff8e574a462fa310cb

bin/internal/engine.version

@@ -1 +1 @@
-84ee23c69b2e9e1b465d0db4e261e60462b5ed54
+cb62dfec1ae1a22be8833353e7d410781c2692ca

bin/internal/flutter.version

@@ -1 +1 @@
-761747bfc538b5af34aa0d3fac380f1bc331ec49
+5874a72aa4c779a02553007c47dacbefba2374dc

lib/build_targets/application.dart

@@ -21,8 +21,8 @@ import 'package:package_config/src/package_config.dart';
 import '../tizen_build_info.dart';
 import 'plugins.dart';
 
-class TizenKernelSnapshot extends KernelSnapshot {
-  const TizenKernelSnapshot();
+class TizenKernelSnapshotProgram extends KernelSnapshotProgram {
+  const TizenKernelSnapshotProgram();
 
   /// Source: [KernelSnapshot.build] in `common.dart`
   @override
@@ -64,6 +64,9 @@ class TizenKernelSnapshot extends KernelSnapshot {
       logger: environment.logger,
     );
 
+    final String dillPath =
+        environment.buildDir.childFile(KernelSnapshotProgram.dillName).path;
+
     final CompilerOutput? output = await compiler.compile(
       sdkRoot: environment.artifacts.getArtifactPath(
         Artifact.flutterPatchedSdkPath,
@@ -73,14 +76,13 @@ class TizenKernelSnapshot extends KernelSnapshot {
       buildMode: buildMode,
       trackWidgetCreation:
           trackWidgetCreation && buildMode != BuildMode.release,
-      outputFilePath: environment.buildDir.childFile('app.dill').path,
-      initializeFromDill: buildMode.isPrecompiled
-          ? null
-          : environment.buildDir.childFile('app.dill').path,
+      outputFilePath: dillPath,
+      initializeFromDill: buildMode.isPrecompiled ? null : dillPath,
       packagesPath: packagesFile.path,
       linkPlatformKernelIn: buildMode.isPrecompiled,
       mainPath: targetFileAbsolute,
-      depFilePath: environment.buildDir.childFile('kernel_snapshot.d').path,
+      depFilePath:
+          environment.buildDir.childFile(KernelSnapshotProgram.depfile).path,
       frontendServerStarterPath: frontendServerStarterPath,
       extraFrontEndOptions: extraFrontEndOptions,
       fileSystemRoots: fileSystemRoots,
@@ -97,6 +99,16 @@ class TizenKernelSnapshot extends KernelSnapshot {
   }
 }
 
+class TizenKernelSnapshot extends KernelSnapshot {
+  const TizenKernelSnapshot();
+
+  @override
+  List<Target> get dependencies => const <Target>[
+        TizenKernelSnapshotProgram(),
+        KernelSnapshotNativeAssets(),
+      ];
+}
+
 /// Prepares the pre-built Flutter bundle.
 ///
 /// Source: [AndroidAssetBundle] in `android.dart`
@@ -156,6 +168,7 @@ abstract class TizenAssetBundle extends Target {
       environment,
       outputDirectory,
       targetPlatform: TargetPlatform.android,
+      buildMode: buildMode,
       flavor: environment.defines[kFlavor],
     );
     final DepfileService depfileService = DepfileService(

lib/commands/create.dart

@@ -194,6 +194,7 @@ class TizenCreateCommand extends CreateCommand {
     String? kotlinVersion,
     String? gradleVersion,
     bool withPlatformChannelPluginHook = false,
+    bool withSwiftPackageManager = false,
     bool withFfiPluginHook = false,
     bool withFfiPackage = false,
     bool withEmptyMain = false,
@@ -219,6 +220,7 @@ class TizenCreateCommand extends CreateCommand {
       kotlinVersion: kotlinVersion,
       gradleVersion: gradleVersion,
       withPlatformChannelPluginHook: withPlatformChannelPluginHook,
+      withSwiftPackageManager: withSwiftPackageManager,
       withFfiPluginHook: withFfiPluginHook,
       withFfiPackage: withFfiPackage,
       withEmptyMain: withEmptyMain,

lib/commands/test.dart

@@ -124,11 +124,11 @@ void main() {
     String? icudtlPath,
     Directory? coverageDirectory,
     bool web = false,
-    bool useWasm = false,
     String? randomSeed,
     String? reporter,
     String? fileReporter,
     String? timeout,
+    bool failFast = false,
     bool runSkipped = false,
     int? shardIndex,
     int? totalShards,
@@ -161,11 +161,11 @@ void main() {
       icudtlPath: icudtlPath,
       coverageDirectory: coverageDirectory,
       web: web,
-      useWasm: useWasm,
       randomSeed: randomSeed,
       reporter: reporter,
       fileReporter: fileReporter,
       timeout: timeout,
+      failFast: failFast,
       runSkipped: runSkipped,
       shardIndex: shardIndex,
       totalShards: totalShards,
@@ -194,6 +194,7 @@ void main() {
     String? reporter,
     String? fileReporter,
     String? timeout,
+    bool failFast = false,
     bool runSkipped = false,
     int? shardIndex,
     int? totalShards,
@@ -220,6 +221,7 @@ void main() {
       reporter: reporter,
       fileReporter: fileReporter,
       timeout: timeout,
+      failFast: failFast,
       runSkipped: runSkipped,
       shardIndex: shardIndex,
       totalShards: totalShards,

templates/multi-app/lib/main.dart.tmpl

@@ -48,7 +48,7 @@ void serviceMain() {
 }
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();
@@ -111,7 +111,7 @@ class _MyAppState extends State<MyApp> {
                 ElevatedButton(
                   onPressed: _terminateService,
                   style: ElevatedButton.styleFrom(
-                    primary: Colors.redAccent,
+                    foregroundColor: Colors.redAccent,
                   ),
                   child: const Text('Terminate service'),
                 )

templates/multi-app/pubspec.yaml.patch

@@ -4,12 +4,12 @@ index 8e9a7d66fb..fa388a4369 100644
 +++ b/packages/flutter_tools/templates/app/pubspec.yaml.tmpl
 @@ -67,6 +67,11 @@ dependencies:
    # Use with the CupertinoIcons class for iOS style icons.
-   cupertino_icons: ^1.0.6
+   cupertino_icons: ^1.0.8
 
 +  # Tizen-specific dependencies.
 +  messageport_tizen: ^0.3.2
-+  tizen_app_control: ^0.2.2
-+  tizen_app_manager: ^0.2.2
++  tizen_app_control: ^0.2.3
++  tizen_app_manager: ^0.2.3
 +
  dev_dependencies:
  {{#withPlatformChannelPluginHook}}

test/general/tizen_builder_test.dart

@@ -59,6 +59,7 @@ void main() {
         trackWidgetCreation: true,
         treeShakeIcons: false,
         codeSizeDirectory: 'code_size_analysis',
+        packageConfigPath: '.dart_tool/package_config.json',
       ),
       targetArch: 'arm',
       deviceProfile: 'common',