diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 07983559a4f..a2c172bf13e 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -8e2a6fc3fd2cffd8b5650171c592b2eafc2a9ad9 +892f9c13a2bb79cf12e5795a3f0fec0a47c008cb diff --git a/.ci/legacy_project/all_packages/android/gradle.properties b/.ci/legacy_project/all_packages/android/gradle.properties index 1e4f83bf98a..598d13fee44 100644 --- a/.ci/legacy_project/all_packages/android/gradle.properties +++ b/.ci/legacy_project/all_packages/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx2G +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 3929a63d54b..8cacbadf478 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -55,7 +55,7 @@ buildFeatures { // the Java heap size when running the Android unit tests. The following property here // sets the heap size to a size large enough to run the robolectric tests across // multiple SDK levels. - jvmArgs "-Xmx1g" + jvmArgs "-Xmx4G" testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" outputs.upToDateWhen {false} diff --git a/packages/file_selector/file_selector/example/android/gradle.properties b/packages/file_selector/file_selector/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/file_selector/file_selector/example/android/gradle.properties +++ b/packages/file_selector/file_selector/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/flutter_adaptive_scaffold/example/android/gradle.properties b/packages/flutter_adaptive_scaffold/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/flutter_adaptive_scaffold/example/android/gradle.properties +++ b/packages/flutter_adaptive_scaffold/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/flutter_image/example/android/gradle.properties b/packages/flutter_image/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/flutter_image/example/android/gradle.properties +++ b/packages/flutter_image/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/flutter_markdown/example/android/gradle.properties b/packages/flutter_markdown/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/flutter_markdown/example/android/gradle.properties +++ b/packages/flutter_markdown/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/flutter_migrate/test/update_locks_test.dart b/packages/flutter_migrate/test/update_locks_test.dart index 735921a2c70..94fa8d95e89 100644 --- a/packages/flutter_migrate/test/update_locks_test.dart +++ b/packages/flutter_migrate/test/update_locks_test.dart @@ -120,7 +120,7 @@ flutter: currentDir.childDirectory('android').childFile('gradle.properties'); gradleProperties.writeAsStringSync(''' org.gradle.daemon=false -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true ''', flush: true); diff --git a/packages/go_router/example/android/gradle.properties b/packages/go_router/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/go_router/example/android/gradle.properties +++ b/packages/go_router/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index a0fed3d9458..a0f46118f4f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -66,7 +66,7 @@ android { // the Java heap size when running the Android unit tests. The following property here // sets the heap size to a size large enough to run the robolectric tests across // multiple SDK levels. - jvmArgs "-Xmx1g" + jvmArgs "-Xmx4G" } } } diff --git a/packages/image_picker/image_picker_android/android/gradle.properties b/packages/image_picker/image_picker_android/android/gradle.properties index 15eca541fba..fb6586169ae 100644 --- a/packages/image_picker/image_picker_android/android/gradle.properties +++ b/packages/image_picker/image_picker_android/android/gradle.properties @@ -1,14 +1 @@ -## For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx1024m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -# -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -#Fri Jan 27 08:52:19 CST 2023 -org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" +org.gradle.jvmargs=-Xmx4G -Dkotlin.daemon.jvm.options\="-Xmx4G" diff --git a/packages/palette_generator/example/android/gradle.properties b/packages/palette_generator/example/android/gradle.properties index 38c8d4544ff..2f3603c9ff6 100644 --- a/packages/palette_generator/example/android/gradle.properties +++ b/packages/palette_generator/example/android/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/packages/pigeon/example/app/android/gradle.properties b/packages/pigeon/example/app/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/pigeon/example/app/android/gradle.properties +++ b/packages/pigeon/example/app/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties b/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties +++ b/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/rfw/example/hello/android/gradle.properties b/packages/rfw/example/hello/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/rfw/example/hello/android/gradle.properties +++ b/packages/rfw/example/hello/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/rfw/example/local/android/gradle.properties b/packages/rfw/example/local/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/rfw/example/local/android/gradle.properties +++ b/packages/rfw/example/local/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/rfw/example/remote/android/gradle.properties b/packages/rfw/example/remote/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/rfw/example/remote/android/gradle.properties +++ b/packages/rfw/example/remote/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/two_dimensional_scrollables/example/android/gradle.properties b/packages/two_dimensional_scrollables/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/packages/two_dimensional_scrollables/example/android/gradle.properties +++ b/packages/two_dimensional_scrollables/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 92decbdda71..9481aea9267 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -61,7 +61,7 @@ android { // the Java heap size when running the Android unit tests. The following property here // sets the heap size to a size large enough to run the robolectric tests across // multiple SDK levels. - jvmArgs "-Xmx1g" + jvmArgs "-Xmx4G" testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" outputs.upToDateWhen {false} diff --git a/third_party/packages/flutter_svg/example/android/gradle.properties b/third_party/packages/flutter_svg/example/android/gradle.properties index 94adc3a3f97..598d13fee44 100644 --- a/third_party/packages/flutter_svg/example/android/gradle.properties +++ b/third_party/packages/flutter_svg/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true