Skip to content

Update for Flutter 3.33 #2313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 34 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
91d47c4
Update `boring_to_beautiful` for Flutter 3.33
domesticmouse May 23, 2025
a70d46d
Update `adaptive_app` for Flutter 3.33
domesticmouse May 23, 2025
d2b5f58
Elide `adaptive_app` from master CI
domesticmouse May 23, 2025
024ff69
Merge branch 'main' into flutter-3.33
domesticmouse May 25, 2025
815da16
Update `animated-responsive-layout` for Flutter 3.33
domesticmouse May 26, 2025
bbda25f
Update `audio_soloud` for Flutter 3.33
domesticmouse May 26, 2025
7bb0aed
Update `brick_breaker` to Flutter 3.33
domesticmouse May 26, 2025
d870bd3
Update `colorist` for Flutter 3.33
domesticmouse May 26, 2025
91ede63
Update `dart-patterns-and-records`
domesticmouse May 26, 2025
25f2f11
Update `deeplink_cookbook`
domesticmouse May 26, 2025
b6544af
Update `ffigen_codelab`
domesticmouse May 26, 2025
481b98d
Update `firebase-auth-flutterfire-ui`
domesticmouse May 26, 2025
5227df0
Update `firebase-emulator-suite`
domesticmouse May 26, 2025
5dae0bc
Update `firebase-get-to-know-flutter`
domesticmouse May 26, 2025
2cd543c
Update `firebase-get-to-know-flutter` part 2
domesticmouse May 26, 2025
501e711
Update `forge2d_game`
domesticmouse May 26, 2025
330c65b
Update `generate_crossword`
domesticmouse May 26, 2025
01d6955
Update `github-client`
domesticmouse May 26, 2025
fe3b659
Update `google-maps-in-flutter`
domesticmouse May 26, 2025
0343708
Update `haiku_generator`
domesticmouse May 26, 2025
25dcd3b
Update `homescreen_codelab`
domesticmouse May 26, 2025
752661e
Update `in_app_purchases`
domesticmouse May 26, 2025
85dde95
Update `intro_flutter_gpu`
domesticmouse May 26, 2025
baa258f
Update `name`
domesticmouse May 26, 2025
63e26bb
Update `next-gen-ui`
domesticmouse May 26, 2025
6f29a81
Update `testing_codelab`
domesticmouse May 26, 2025
4ada186
Update `tfagents-flutter`
domesticmouse May 26, 2025
73b8760
Update `tfrs-flutter`
domesticmouse May 26, 2025
991356e
Update `tfserving-flutter`
domesticmouse May 26, 2025
63d885c
Update `webview_flutter`
domesticmouse May 26, 2025
68ce75d
Drop redundant cast
domesticmouse May 26, 2025
25da9e0
Add tracking bug
domesticmouse May 26, 2025
8caaa68
Merge branch 'flutter:main' into flutter-3.33
domesticmouse May 28, 2025
9633b1b
Merge branch 'main' into flutter-3.33
domesticmouse Jun 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 0 additions & 11 deletions adaptive_app/codelab_rebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1266,17 +1266,6 @@ steps:
- name: Add googleapis_auth google_sign_in extension_google_sign_in_as_googleapis_auth
path: adaptive_app
flutter: pub add googleapis_auth google_sign_in extension_google_sign_in_as_googleapis_auth http
- name: Patch macos/Podfile
path: adaptive_app/macos/Podfile
patch-u: |
--- b/adaptive_app/step_07/macos/Podfile
+++ a/adaptive_app/step_07/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.14'
+platform :osx, '10.15'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
- name: Patch .gitignore
path: adaptive_app/.gitignore
patch-u: |
Expand Down
5 changes: 4 additions & 1 deletion adaptive_app/step_03/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ allprojects {
}
}

val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
val newBuildDir: Directory =
rootProject.layout.buildDirectory
.dir("../../build")
.get()
rootProject.layout.buildDirectory.value(newBuildDir)

subprojects {
Expand Down
17 changes: 9 additions & 8 deletions adaptive_app/step_03/android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
pluginManagement {
val flutterSdkPath = run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}
val flutterSdkPath =
run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}

includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

Expand All @@ -18,7 +19,7 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.3" apply false
id("com.android.application") version "8.9.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}

Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_03/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<string>13.0</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions adaptive_app/step_03/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -472,7 +472,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -523,7 +523,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
6 changes: 3 additions & 3 deletions adaptive_app/step_03/macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down Expand Up @@ -543,7 +543,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -593,7 +593,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_03/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ^3.8.0
sdk: ^3.9.0-0

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
5 changes: 4 additions & 1 deletion adaptive_app/step_04/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ allprojects {
}
}

val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
val newBuildDir: Directory =
rootProject.layout.buildDirectory
.dir("../../build")
.get()
rootProject.layout.buildDirectory.value(newBuildDir)

subprojects {
Expand Down
17 changes: 9 additions & 8 deletions adaptive_app/step_04/android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
pluginManagement {
val flutterSdkPath = run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}
val flutterSdkPath =
run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}

includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

Expand All @@ -18,7 +19,7 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.3" apply false
id("com.android.application") version "8.9.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}

Expand Down
2 changes: 1 addition & 1 deletion adaptive_app/step_04/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<string>13.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion adaptive_app/step_04/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '12.0'
# platform :ios, '13.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
Loading
Loading