Merge branch 'main' of https://github.com/flutter/codelabs into flutter-3.33

domesticmouse · domesticmouse · commit 62dfd3b8914a · 2025-08-11T22:13:58.000+10:00
diff --git a/boring_to_beautiful/step_01/pubspec.yaml b/boring_to_beautiful/step_01/pubspec.yaml
@@ -13,11 +13,11 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
diff --git a/boring_to_beautiful/step_02/pubspec.yaml b/boring_to_beautiful/step_02/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_03/pubspec.yaml b/boring_to_beautiful/step_03/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_04/pubspec.yaml b/boring_to_beautiful/step_04/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_05_a/pubspec.yaml b/boring_to_beautiful/step_05_a/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_05_b/pubspec.yaml b/boring_to_beautiful/step_05_b/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_05_c/pubspec.yaml b/boring_to_beautiful/step_05_c/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_06/pubspec.yaml b/boring_to_beautiful/step_06/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/boring_to_beautiful/step_07/pubspec.yaml b/boring_to_beautiful/step_07/pubspec.yaml
@@ -13,15 +13,15 @@ dependencies:
   collection: ^1.19.1
   cupertino_icons: ^1.0.8
   desktop_window: ^0.4.2
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.8.1
   english_words: ^4.0.0
   flutter_bloc: ^9.1.1
   freezed_annotation: ^3.1.0
-  go_router: ^16.0.0
+  go_router: ^16.1.0
   material_color_utilities: any
   universal_platform: ^1.1.0
   url_launcher: ^6.3.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_03/pubspec.yaml b/brick_breaker/step_03/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_04/pubspec.yaml b/brick_breaker/step_04/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_05/pubspec.yaml b/brick_breaker/step_05/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_06/pubspec.yaml b/brick_breaker/step_06/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_07/pubspec.yaml b/brick_breaker/step_07/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_08/pubspec.yaml b/brick_breaker/step_08/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_09/pubspec.yaml b/brick_breaker/step_09/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/brick_breaker/step_10/pubspec.yaml b/brick_breaker/step_10/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   flame: ^1.30.1
   flutter_animate: ^4.5.2
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/ffigen_codelab/step_07/example/pubspec.yaml b/ffigen_codelab/step_07/example/pubspec.yaml
@@ -44,7 +44,7 @@ dependencies:
   cupertino_icons: ^1.0.8
   flutter_riverpod: ^2.6.1
   freezed_annotation: ^3.1.0
-  google_fonts: ^6.2.1
+  google_fonts: ^6.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/codelab_rebuild.yaml b/firebase-get-to-know-flutter/codelab_rebuild.yaml
@@ -56,6 +56,21 @@ steps:
            
              # To add assets to your application, add an assets section, like this:
              # assets:
+      - name: Patch ios/Podfile
+        path: gtk_flutter/ios/Podfile
+        patch-u: |
+          --- a/firebase-get-to-know-flutter/step_02/ios/Podfile
+          +++ b/firebase-get-to-know-flutter/step_02/ios/Podfile
+          @@ -1,5 +1,5 @@
+           # Uncomment this line to define a global platform for your project
+          -# platform :ios, '13.0'
+          +platform :ios, '15.0'
+           
+           # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+           ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+      - name: Patch ios/Runner.xcodeproj/project.pbxproj
+        xcode-project-path: gtk_flutter/ios/Runner.xcodeproj
+        iphoneos-deployment-target: '15.0'
       - name: Remove the README.md
         rm: gtk_flutter/README.md
       - name: VSCode config
diff --git a/firebase-get-to-know-flutter/step_02/ios/Podfile b/firebase-get-to-know-flutter/step_02/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/firebase-get-to-know-flutter/step_02/pubspec.yaml b/firebase-get-to-know-flutter/step_02/pubspec.yaml
@@ -35,8 +35,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  go_router: ^16.0.0
+  google_fonts: ^6.3.0
+  go_router: ^16.1.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/step_04/ios/Podfile b/firebase-get-to-know-flutter/step_04/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/firebase-get-to-know-flutter/step_04/pubspec.yaml b/firebase-get-to-know-flutter/step_04/pubspec.yaml
@@ -35,13 +35,13 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  go_router: ^16.0.0
-  cloud_firestore: ^5.6.12
-  firebase_auth: ^5.7.0
-  firebase_core: ^3.15.2
+  google_fonts: ^6.3.0
+  go_router: ^16.1.0
+  cloud_firestore: ^6.0.0
+  firebase_auth: ^6.0.0
+  firebase_core: ^4.0.0
   provider: ^6.1.5
-  firebase_ui_auth: ^2.0.0
+  firebase_ui_auth: ^3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/step_05/ios/Podfile b/firebase-get-to-know-flutter/step_05/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/firebase-get-to-know-flutter/step_05/pubspec.yaml b/firebase-get-to-know-flutter/step_05/pubspec.yaml
@@ -35,13 +35,13 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  go_router: ^16.0.0
-  cloud_firestore: ^5.6.12
-  firebase_auth: ^5.7.0
-  firebase_core: ^3.15.2
+  google_fonts: ^6.3.0
+  go_router: ^16.1.0
+  cloud_firestore: ^6.0.0
+  firebase_auth: ^6.0.0
+  firebase_core: ^4.0.0
   provider: ^6.1.5
-  firebase_ui_auth: ^2.0.0
+  firebase_ui_auth: ^3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/step_06/ios/Podfile b/firebase-get-to-know-flutter/step_06/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/firebase-get-to-know-flutter/step_06/pubspec.yaml b/firebase-get-to-know-flutter/step_06/pubspec.yaml
@@ -35,13 +35,13 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  go_router: ^16.0.0
-  cloud_firestore: ^5.6.12
-  firebase_auth: ^5.7.0
-  firebase_core: ^3.15.2
+  google_fonts: ^6.3.0
+  go_router: ^16.1.0
+  cloud_firestore: ^6.0.0
+  firebase_auth: ^6.0.0
+  firebase_core: ^4.0.0
   provider: ^6.1.5
-  firebase_ui_auth: ^2.0.0
+  firebase_ui_auth: ^3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/step_07/ios/Podfile b/firebase-get-to-know-flutter/step_07/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/firebase-get-to-know-flutter/step_07/pubspec.yaml b/firebase-get-to-know-flutter/step_07/pubspec.yaml
@@ -35,13 +35,13 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
-  google_fonts: ^6.2.1
-  go_router: ^16.0.0
-  cloud_firestore: ^5.6.12
-  firebase_auth: ^5.7.0
-  firebase_core: ^3.15.2
+  google_fonts: ^6.3.0
+  go_router: ^16.1.0
+  cloud_firestore: ^6.0.0
+  firebase_auth: ^6.0.0
+  firebase_core: ^4.0.0
   provider: ^6.1.5
-  firebase_ui_auth: ^2.0.0
+  firebase_ui_auth: ^3.0.0
 
 dev_dependencies:
   flutter_test:
diff --git a/firebase-get-to-know-flutter/step_09/ios/Podfile b/firebase-get-to-know-flutter/step_09/ios/Podfile
diff --git a/firebase-get-to-know-flutter/step_09/pubspec.yaml b/firebase-get-to-know-flutter/step_09/pubspec.yaml
diff --git a/flutter_ci_script_beta.sh b/flutter_ci_script_beta.sh
diff --git a/flutter_ci_script_master.sh b/flutter_ci_script_master.sh
