Consolidated Flutter 3.3 update (flutter#1401)

lang-xin · Aug 31, 2022 · 83f7059 · 83f7059
1 parent 1281d43
commit 83f7059
Show file tree

Hide file tree

Showing 81 changed files with 316 additions and 303 deletions.
diff --git a/add_to_app/books/flutter_module_books/lib/api.dart b/add_to_app/books/flutter_module_books/lib/api.dart
@@ -5,7 +5,6 @@
 import 'dart:async';
 import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List;
 
-import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer;
 import 'package:flutter/services.dart';
 
 class Book {

diff --git a/desktop_photo_search/fluent_ui/.metadata b/desktop_photo_search/fluent_ui/.metadata
@@ -4,26 +4,26 @@
 # This file should be version controlled.
 
 version:
-  revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-  channel: stable
+  revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+  channel: beta
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: linux
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: macos
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: windows
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
 
   # User provided section
 

diff --git a/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart b/desktop_photo_search/fluent_ui/lib/src/model/photo_search_model.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
 import 'package:flutter/foundation.dart';
 
 import '../unsplash/photo.dart';

diff --git a/...rch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/...rch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
diff --git a/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
diff --git a/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
diff --git a/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
diff --git a/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
diff --git a/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/...arch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
diff --git a/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/...earch/fluent_ui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
diff --git a/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt b/desktop_photo_search/fluent_ui/windows/runner/CMakeLists.txt
@@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32
 # that need different build settings.
 apply_standard_settings(${BINARY_NAME})
 
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
 # Disable Windows macros that collide with C++ standard library functions.
 target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
 

diff --git a/desktop_photo_search/fluent_ui/windows/runner/Runner.rc b/desktop_photo_search/fluent_ui/windows/runner/Runner.rc
@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif

diff --git a/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest b/desktop_photo_search/fluent_ui/windows/runner/runner.exe.manifest
@@ -7,7 +7,7 @@
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>

diff --git a/desktop_photo_search/material/.metadata b/desktop_photo_search/material/.metadata
@@ -4,26 +4,26 @@
 # This file should be version controlled.
 
 version:
-  revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-  channel: stable
+  revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+  channel: beta
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: linux
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: macos
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: windows
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
 
   # User provided section
 

diff --git a/desktop_photo_search/material/lib/src/model/photo_search_model.dart b/desktop_photo_search/material/lib/src/model/photo_search_model.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
 import 'package:flutter/foundation.dart';
 
 import '../unsplash/photo.dart';

diff --git a/...arch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/...arch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
diff --git a/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
diff --git a/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
diff --git a/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
diff --git a/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
diff --git a/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/...earch/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
diff --git a/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/...search/material/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
diff --git a/desktop_photo_search/material/windows/runner/CMakeLists.txt b/desktop_photo_search/material/windows/runner/CMakeLists.txt
@@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32
 # that need different build settings.
 apply_standard_settings(${BINARY_NAME})
 
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
 # Disable Windows macros that collide with C++ standard library functions.
 target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
 

diff --git a/desktop_photo_search/material/windows/runner/Runner.rc b/desktop_photo_search/material/windows/runner/Runner.rc
@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif

diff --git a/desktop_photo_search/material/windows/runner/runner.exe.manifest b/desktop_photo_search/material/windows/runner/runner.exe.manifest
@@ -7,7 +7,7 @@
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>

diff --git a/experimental/web_dashboard/lib/src/pages/home.dart b/experimental/web_dashboard/lib/src/pages/home.dart
@@ -34,10 +34,7 @@ class _HomePageState extends State<HomePage> {
         Padding(
           padding: const EdgeInsets.all(8.0),
           child: TextButton(
-            style: TextButton.styleFrom(
-              // ignore: deprecated_member_use
-              primary: Colors.white,
-            ),
+            style: TextButton.styleFrom(foregroundColor: Colors.white),
             onPressed: () => _handleSignOut(),
             child: const Text('Sign Out'),
           ),

diff --git a/form_app/.metadata b/form_app/.metadata
@@ -4,35 +4,35 @@
 # This file should be version controlled.
 
 version:
-  revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-  channel: stable
+  revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+  channel: beta
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: android
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: ios
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: linux
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: macos
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: web
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
     - platform: windows
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
+      base_revision: 7ac27ac8e6a42750c475ba8a2a3c7047b93fd949
 
   # User provided section
 

diff --git a/form_app/android/gradle/wrapper/gradle-wrapper.properties b/form_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,3 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/form_app/ios/Flutter/AppFrameworkInfo.plist b/form_app/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/form_app/ios/Podfile b/form_app/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'