diff --git a/flutter_ci_script_shared.sh b/flutter_ci_script_shared.sh
index 5ef951572b..133b3e83ec 100755
--- a/flutter_ci_script_shared.sh
+++ b/flutter_ci_script_shared.sh
@@ -50,11 +50,11 @@ function ci_codelabs () {
 
                     # intro_flutter_gpu only runs with Impeller
                     if [ $CODELAB = 'intro_flutter_gpu' ]; then
-                        # Skipping Windows: https://github.com/bdero/flutter_scene/issues/55
-                        if [ $RUNNER_OS = 'macOS' ] || [ $RUNNER_OS = 'Linux' ]; then
+                        # Skipping Windows and Linux: https://github.com/bdero/flutter_scene/issues/55
+                        if [ $RUNNER_OS = 'macOS' ]; then
                             flutter config --enable-native-assets
                             flutter build `echo $RUNNER_OS | tr '[:upper:]' '[:lower:]'` --debug
-                            flutter test --enable-impeller
+                            flutter test --enable-flutter-gpu
                         else
                             echo "Skipping $CODELAB on $RUNNER_OS"
                         fi
diff --git a/intro_flutter_gpu/codelab_rebuild.yaml b/intro_flutter_gpu/codelab_rebuild.yaml
index 8c4e02cdc8..0f704294d5 100644
--- a/intro_flutter_gpu/codelab_rebuild.yaml
+++ b/intro_flutter_gpu/codelab_rebuild.yaml
@@ -289,7 +289,7 @@ steps:
             testWidgets('smoke test', (tester) async {
               // Build our app and trigger a frame.
               await tester.pumpWidget(const MainApp());
-            }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+            }, skip: true); // https://github.com/flutter/flutter/issues/173650
           }
       - name: Patch macos/Runner/Info.plist
         path: intro_flutter_gpu/macos/Runner/Info.plist
@@ -300,11 +300,42 @@ steps:
            	<string>MainMenu</string>
            	<key>NSPrincipalClass</key>
            	<string>NSApplication</string>
-          +	<!-- flutter_gpu requires Impeller -->
-          +	<key>FLTEnableImpeller</key>
+          +	<!-- Required for flutter_gpu -->
+          +	<key>FLTEnableFlutterGPU</key>
           +	<true />
            </dict>
            </plist>
+      - name: Patch ios/Runner/Info.plist
+        path: intro_flutter_gpu/ios/Runner/Info.plist
+        patch-u: |
+          --- a/intro_flutter_gpu/step_12/ios/Runner/Info.plist
+          +++ b/intro_flutter_gpu/step_12/ios/Runner/Info.plist
+          @@ -45,5 +45,8 @@
+           	<true/>
+           	<key>UIApplicationSupportsIndirectInputEvents</key>
+           	<true/>
+          +	<!-- Required for flutter_gpu -->
+          +	<key>FLTEnableFlutterGPU</key>
+          +	<true />
+           </dict>
+           </plist>
+      - name: Patch android/app/src/main/AndroidManifest.xml
+        path: intro_flutter_gpu/android/app/src/main/AndroidManifest.xml
+        patch-u: |
+          --- a/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml
+          +++ b/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml
+          @@ -3,6 +3,11 @@
+                   android:label="intro_flutter_gpu"
+                   android:name="${applicationName}"
+                   android:icon="@mipmap/ic_launcher">
+          +
+          +        <meta-data
+          +            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+          +            android:value="true" />
+          +
+                   <activity
+                       android:name=".MainActivity"
+                       android:exported="true"
       - name: Copy step_01
         copydir:
           from: intro_flutter_gpu
@@ -2233,7 +2264,7 @@ steps:
           +    await tester.pumpWidget(
           +      MainApp(staticResourcesInitialized: Scene.initializeStaticResources()),
           +    );
-             }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+             }, skip: true); // https://github.com/flutter/flutter/issues/173650
            }
       - name: Copy step_12
         copydir:
diff --git a/intro_flutter_gpu/step_01/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_01/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_01/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_01/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_01/android/gradle.properties b/intro_flutter_gpu/step_01/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_01/android/gradle.properties
+++ b/intro_flutter_gpu/step_01/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_01/ios/Runner/Info.plist b/intro_flutter_gpu/step_01/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_01/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_01/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_01/macos/Runner/Info.plist b/intro_flutter_gpu/step_01/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_01/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_01/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_01/pubspec.yaml b/intro_flutter_gpu/step_01/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_01/pubspec.yaml
+++ b/intro_flutter_gpu/step_01/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_01/test/widget_test.dart b/intro_flutter_gpu/step_01/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_01/test/widget_test.dart
+++ b/intro_flutter_gpu/step_01/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_02/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_02/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_02/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_02/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_02/android/gradle.properties b/intro_flutter_gpu/step_02/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_02/android/gradle.properties
+++ b/intro_flutter_gpu/step_02/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_02/ios/Runner/Info.plist b/intro_flutter_gpu/step_02/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_02/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_02/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_02/macos/Runner/Info.plist b/intro_flutter_gpu/step_02/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_02/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_02/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_02/pubspec.yaml b/intro_flutter_gpu/step_02/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_02/pubspec.yaml
+++ b/intro_flutter_gpu/step_02/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_02/test/widget_test.dart b/intro_flutter_gpu/step_02/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_02/test/widget_test.dart
+++ b/intro_flutter_gpu/step_02/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_03/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_03/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_03/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_03/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_03/android/gradle.properties b/intro_flutter_gpu/step_03/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_03/android/gradle.properties
+++ b/intro_flutter_gpu/step_03/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_03/ios/Runner/Info.plist b/intro_flutter_gpu/step_03/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_03/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_03/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_03/macos/Runner/Info.plist b/intro_flutter_gpu/step_03/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_03/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_03/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_03/pubspec.yaml b/intro_flutter_gpu/step_03/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_03/pubspec.yaml
+++ b/intro_flutter_gpu/step_03/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_03/test/widget_test.dart b/intro_flutter_gpu/step_03/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_03/test/widget_test.dart
+++ b/intro_flutter_gpu/step_03/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_04/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_04/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_04/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_04/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_04/android/gradle.properties b/intro_flutter_gpu/step_04/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_04/android/gradle.properties
+++ b/intro_flutter_gpu/step_04/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_04/ios/Runner/Info.plist b/intro_flutter_gpu/step_04/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_04/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_04/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_04/macos/Runner/Info.plist b/intro_flutter_gpu/step_04/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_04/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_04/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_04/pubspec.yaml b/intro_flutter_gpu/step_04/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_04/pubspec.yaml
+++ b/intro_flutter_gpu/step_04/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_04/test/widget_test.dart b/intro_flutter_gpu/step_04/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_04/test/widget_test.dart
+++ b/intro_flutter_gpu/step_04/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_05/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_05/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_05/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_05/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_05/android/gradle.properties b/intro_flutter_gpu/step_05/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_05/android/gradle.properties
+++ b/intro_flutter_gpu/step_05/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_05/ios/Runner/Info.plist b/intro_flutter_gpu/step_05/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_05/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_05/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_05/macos/Runner/Info.plist b/intro_flutter_gpu/step_05/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_05/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_05/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_05/pubspec.yaml b/intro_flutter_gpu/step_05/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_05/pubspec.yaml
+++ b/intro_flutter_gpu/step_05/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_05/test/widget_test.dart b/intro_flutter_gpu/step_05/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_05/test/widget_test.dart
+++ b/intro_flutter_gpu/step_05/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_06/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_06/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_06/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_06/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_06/android/gradle.properties b/intro_flutter_gpu/step_06/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_06/android/gradle.properties
+++ b/intro_flutter_gpu/step_06/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_06/ios/Runner/Info.plist b/intro_flutter_gpu/step_06/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_06/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_06/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_06/macos/Runner/Info.plist b/intro_flutter_gpu/step_06/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_06/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_06/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_06/pubspec.yaml b/intro_flutter_gpu/step_06/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_06/pubspec.yaml
+++ b/intro_flutter_gpu/step_06/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_06/test/widget_test.dart b/intro_flutter_gpu/step_06/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_06/test/widget_test.dart
+++ b/intro_flutter_gpu/step_06/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_07/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_07/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_07/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_07/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_07/android/gradle.properties b/intro_flutter_gpu/step_07/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_07/android/gradle.properties
+++ b/intro_flutter_gpu/step_07/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_07/ios/Runner/Info.plist b/intro_flutter_gpu/step_07/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_07/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_07/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_07/macos/Runner/Info.plist b/intro_flutter_gpu/step_07/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_07/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_07/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_07/pubspec.yaml b/intro_flutter_gpu/step_07/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_07/pubspec.yaml
+++ b/intro_flutter_gpu/step_07/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_07/test/widget_test.dart b/intro_flutter_gpu/step_07/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_07/test/widget_test.dart
+++ b/intro_flutter_gpu/step_07/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_08/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_08/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_08/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_08/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_08/android/gradle.properties b/intro_flutter_gpu/step_08/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_08/android/gradle.properties
+++ b/intro_flutter_gpu/step_08/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_08/ios/Runner/Info.plist b/intro_flutter_gpu/step_08/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_08/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_08/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_08/macos/Runner/Info.plist b/intro_flutter_gpu/step_08/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_08/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_08/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_08/pubspec.yaml b/intro_flutter_gpu/step_08/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_08/pubspec.yaml
+++ b/intro_flutter_gpu/step_08/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_08/test/widget_test.dart b/intro_flutter_gpu/step_08/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_08/test/widget_test.dart
+++ b/intro_flutter_gpu/step_08/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_09/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_09/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_09/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_09/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_09/android/gradle.properties b/intro_flutter_gpu/step_09/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_09/android/gradle.properties
+++ b/intro_flutter_gpu/step_09/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_09/ios/Runner/Info.plist b/intro_flutter_gpu/step_09/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_09/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_09/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_09/macos/Runner/Info.plist b/intro_flutter_gpu/step_09/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_09/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_09/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_09/pubspec.yaml b/intro_flutter_gpu/step_09/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_09/pubspec.yaml
+++ b/intro_flutter_gpu/step_09/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_09/test/widget_test.dart b/intro_flutter_gpu/step_09/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_09/test/widget_test.dart
+++ b/intro_flutter_gpu/step_09/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_10/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_10/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_10/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_10/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_10/android/gradle.properties b/intro_flutter_gpu/step_10/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_10/android/gradle.properties
+++ b/intro_flutter_gpu/step_10/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_10/ios/Runner/Info.plist b/intro_flutter_gpu/step_10/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_10/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_10/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_10/macos/Runner/Info.plist b/intro_flutter_gpu/step_10/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_10/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_10/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_10/pubspec.yaml b/intro_flutter_gpu/step_10/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_10/pubspec.yaml
+++ b/intro_flutter_gpu/step_10/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_10/test/widget_test.dart b/intro_flutter_gpu/step_10/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_10/test/widget_test.dart
+++ b/intro_flutter_gpu/step_10/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_11/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_11/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_11/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_11/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_11/android/gradle.properties b/intro_flutter_gpu/step_11/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_11/android/gradle.properties
+++ b/intro_flutter_gpu/step_11/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_11/ios/Runner/Info.plist b/intro_flutter_gpu/step_11/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_11/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_11/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_11/macos/Runner/Info.plist b/intro_flutter_gpu/step_11/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_11/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_11/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_11/pubspec.yaml b/intro_flutter_gpu/step_11/pubspec.yaml
index 29b9fa9ac0..ee595590c1 100644
--- a/intro_flutter_gpu/step_11/pubspec.yaml
+++ b/intro_flutter_gpu/step_11/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_11/test/widget_test.dart b/intro_flutter_gpu/step_11/test/widget_test.dart
index c8810a3ffd..11deb866f5 100644
--- a/intro_flutter_gpu/step_11/test/widget_test.dart
+++ b/intro_flutter_gpu/step_11/test/widget_test.dart
@@ -10,5 +10,5 @@ void main() {
   testWidgets('smoke test', (tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(const MainApp());
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }
diff --git a/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml b/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml
index fdfe2fab73..2e1d9a0bf5 100644
--- a/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml
+++ b/intro_flutter_gpu/step_12/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
         android:label="intro_flutter_gpu"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableFlutterGPU"
+            android:value="true" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/intro_flutter_gpu/step_12/android/gradle.properties b/intro_flutter_gpu/step_12/android/gradle.properties
index f018a61817..fbee1d8cda 100644
--- a/intro_flutter_gpu/step_12/android/gradle.properties
+++ b/intro_flutter_gpu/step_12/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/intro_flutter_gpu/step_12/ios/Runner/Info.plist b/intro_flutter_gpu/step_12/ios/Runner/Info.plist
index 0edabab8ed..c9483df05c 100644
--- a/intro_flutter_gpu/step_12/ios/Runner/Info.plist
+++ b/intro_flutter_gpu/step_12/ios/Runner/Info.plist
@@ -45,5 +45,8 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
+	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_12/macos/Runner/Info.plist b/intro_flutter_gpu/step_12/macos/Runner/Info.plist
index b20337be02..a880505957 100644
--- a/intro_flutter_gpu/step_12/macos/Runner/Info.plist
+++ b/intro_flutter_gpu/step_12/macos/Runner/Info.plist
@@ -28,8 +28,8 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<!-- flutter_gpu requires Impeller -->
-	<key>FLTEnableImpeller</key>
+	<!-- Required for flutter_gpu -->
+	<key>FLTEnableFlutterGPU</key>
 	<true />
 </dict>
 </plist>
diff --git a/intro_flutter_gpu/step_12/pubspec.yaml b/intro_flutter_gpu/step_12/pubspec.yaml
index 626733bfe1..b3964a421a 100644
--- a/intro_flutter_gpu/step_12/pubspec.yaml
+++ b/intro_flutter_gpu/step_12/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.9.0-0
+  sdk: ^3.10.0-0
 
 dependencies:
   flutter:
@@ -17,7 +17,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
 flutter:
   uses-material-design: true
diff --git a/intro_flutter_gpu/step_12/test/widget_test.dart b/intro_flutter_gpu/step_12/test/widget_test.dart
index 558000a649..7c4ea8b821 100644
--- a/intro_flutter_gpu/step_12/test/widget_test.dart
+++ b/intro_flutter_gpu/step_12/test/widget_test.dart
@@ -13,5 +13,5 @@ void main() {
     await tester.pumpWidget(
       MainApp(staticResourcesInitialized: Scene.initializeStaticResources()),
     );
-  }, skip: true); // See https://github.com/flutter/flutter/issues/171361
+  }, skip: true); // https://github.com/flutter/flutter/issues/173650
 }