From 58a7052cd24a8fa9cd78fd26e7ffa3f026a7b2d3 Mon Sep 17 00:00:00 2001
From: Hidenori Matsubayashi <Hidenori.Matsubayashi@gmail.com>
Date: Tue, 14 May 2024 18:16:04 +0900
Subject: [PATCH] release: upgrade to flutter 3.22.0

Signed-off-by: Hidenori Matsubayashi <Hidenori.Matsubayashi@gmail.com>
---
 .github/workflows/analysis.yml | 5 +++--
 bin/internal/engine.version    | 2 +-
 bin/internal/flutter.version   | 4 ++--
 lib/elinux_build_target.dart   | 3 +--
 lib/executable.dart            | 3 +++
 pubspec.yaml                   | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index e2f87e0..f33f18f 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -12,10 +12,11 @@ jobs:
 
       - name: Fetch Flutter SDK
         run: |
-          git clone --depth=1 https://github.com/flutter/flutter.git
+          git clone https://github.com/flutter/flutter.git
           cd flutter
-          git fetch --depth=1 https://github.com/flutter/flutter.git `cat ../bin/internal/flutter.version`
+          git fetch https://github.com/flutter/flutter.git `cat ../bin/internal/flutter.version`
           git checkout FETCH_HEAD
+          ./bin/flutter doctor
 
       - name: Install pub dependencies
         run: flutter/bin/flutter pub get
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 05b664c..39b8052 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-c4cd48e186460b32d44585ce3c103271ab676355
+f6344b75dcf861d8bf1f1322780b8811f982e31a
diff --git a/bin/internal/flutter.version b/bin/internal/flutter.version
index fce9810..c4f8b3f 100644
--- a/bin/internal/flutter.version
+++ b/bin/internal/flutter.version
@@ -1,2 +1,2 @@
-54e66469a933b60ddf175f858f82eaeb97e48c8d
-3.19.6
+5dcb86f68f239346676ceb1ed1ea385bd215fba1
+3.22.0
diff --git a/lib/elinux_build_target.dart b/lib/elinux_build_target.dart
index f0724e6..1ffb44b 100644
--- a/lib/elinux_build_target.dart
+++ b/lib/elinux_build_target.dart
@@ -19,7 +19,6 @@ import 'package:flutter_tools/src/build_system/targets/android.dart';
 import 'package:flutter_tools/src/build_system/targets/assets.dart';
 import 'package:flutter_tools/src/build_system/targets/common.dart';
 import 'package:flutter_tools/src/build_system/targets/icon_tree_shaker.dart';
-import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/cmake.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
@@ -93,7 +92,7 @@ abstract class ELinuxAssetBundle extends Target {
       outputDirectory,
       targetPlatform: tp,
       buildMode: buildMode,
-      shaderTarget: ShaderTarget.sksl,
+      flavor: environment.defines[kFlavor],
     );
     final DepfileService depfileService = DepfileService(
       fileSystem: environment.fileSystem,
diff --git a/lib/executable.dart b/lib/executable.dart
index f8b2878..60413a0 100644
--- a/lib/executable.dart
+++ b/lib/executable.dart
@@ -14,6 +14,7 @@ import 'package:flutter_tools/src/base/context.dart';
 import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/template.dart';
+import 'package:flutter_tools/src/build_system/build_targets.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/config.dart';
 import 'package:flutter_tools/src/commands/devices.dart';
@@ -28,6 +29,7 @@ import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/doctor.dart';
 import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:flutter_tools/src/isolated/build_targets.dart';
 import 'package:flutter_tools/src/isolated/mustache_template.dart';
 import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:path/path.dart';
@@ -157,6 +159,7 @@ Future<void> main(List<String> args) async {
             processManager: globals.processManager,
             userMessages: globals.userMessages,
           ),
+      BuildTargets: () => const BuildTargetsImpl(),
       if (verbose && !muteCommandLogging)
         Logger: () => VerboseLogger(StdoutLogger(
               stdio: globals.stdio,
diff --git a/pubspec.yaml b/pubspec.yaml
index 40dfed3..ceb5557 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/sony/flutter-elinux
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.2.0-0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
   flutter_tools: